From cf8dba7748cc9826d744069b5063a14e3fcd2fa8 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 13 三月 2025 10:48:17 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/AP/APNew3.warizd.cpp | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/jrj/project/business/AP/APNew3.warizd.cpp b/jrj/project/business/AP/APNew3.warizd.cpp
index deaedf2..d6a2c6f 100644
--- a/jrj/project/business/AP/APNew3.warizd.cpp
+++ b/jrj/project/business/AP/APNew3.warizd.cpp
@@ -2,6 +2,7 @@
#include <xcontrol/xtreeview.hpp>
#include <xcontrol/xdwgrid.hpp>
#include <wobject/xdouble.hpp>
+#include <xcontrol/xlayersheet.hpp>
#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
@@ -379,7 +380,7 @@
else if (comdid == L"xmFilter") return OnFilter();
else if (comdid == L"xmQuery")
{
-
+
index = m_layer.GetSheetIndex();
index++;
OnRetrieve();
@@ -430,8 +431,8 @@
int row = hdr.row;
OnPrepayRetrieve(row, bstart);
- xml x = ViewObject::RetrieveData( L"/sale/data/AP/list/invoice/supplier", L"InvoiceNo", dw_1.GetItemString(row, L"InvoiceNo"),
- "SupplierID", dw_1.GetItemString(row, L"SupplierID"));
+ xml x = ViewObject::RetrieveData(GetServerUrl(), L"/sale/data/AP/list/invoice/supplier", L"InvoiceNo", dw_1.GetItemString(row, L"InvoiceNo"),
+ L"SupplierID", dw_1.GetItemString(row, L"SupplierID"));
if (x) dw_101.Retrieve(x);
dw_2.Redraw();
@@ -548,13 +549,9 @@
KXMLDOMElement e = lst.item(i);
docElement.appendChild(e);
KXMLDOMElement fe = x1.createElement(L"FilterColumn");
- fe.text = filterStr;
+ fe.settext(filterStr);
e.appendChild(fe);
- fe.Release();
- e.Release();
}
- docElement.Release();
- lst.Release();
dw_2.Retrieve(x1);
}
else
@@ -578,11 +575,11 @@
arg.AddArg(L"QueryTxt", xcontrol(GetControl(L"sle_search")).GetText());
xcombobox cbx_type = GetControl(L"cbx_ship");
- int h = xcombobox::GetCurSel(cbx_type.GetHWND());
+ int h = cbx_type.GetCurSel();
if (h < 0) return 1;
- xstring str = xcombobox::GetItemData(cbx_type.GetHWND());
+ xstring str = (string)cbx_type.GetItemData(h);
arg.AddArg(L"ShipDays", str);
- trace(str);
+
if (getUrl(L"/sale/data/AP/list101", arg.GetString(), x) != 1)
{
trace(x.text());
@@ -591,6 +588,7 @@
}
else
{
+
dw_1.Retrieve(x);
dw_1.Redraw();
}
--
Gitblit v1.9.3