From 07acaa92f662da05c39d0bd07dd354bb1929fbcf Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期四, 18 七月 2024 23:24:42 +0800
Subject: [PATCH] update
---
jrj/project/business/SO/Product.Select.SO.cpp | 33 +++++++++------------------------
1 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/jrj/project/business/SO/Product.Select.SO.cpp b/jrj/project/business/SO/Product.Select.SO.cpp
index 7ac9354..1b7aeb6 100644
--- a/jrj/project/business/SO/Product.Select.SO.cpp
+++ b/jrj/project/business/SO/Product.Select.SO.cpp
@@ -1044,7 +1044,7 @@
if (selectname != name)
{
- KXMLDOMElement& e1 = tv_folder.GetItemData(hItem);
+ KXMLDOMElement e1 = tv_folder.GetItemData(hItem);
xstring str = e1.getAttribute(L"no");
if (str.find(L"Customer1:") == 0 || str.find(L"Customer:") == 0 || str.find(L"SO:") == 0 || str.find(L"Quote:") == 0)
{
@@ -1054,7 +1054,6 @@
dwc_list.openUrl(L"/sale/view/ProductLibrary/template/cart/goodssolist");
}
dwc_list.SetReadOnly(true);
- trace(str + L"+++++L" + queryString);
g_xdoc_shoppingcart.Retrieve(ShoppingCartView::GetGoodsList(str, queryString));
}
@@ -1194,11 +1193,10 @@
int OnDwcClicked(TEvent* evt, LPARAM p)
{
DWNMHDR& hdr = *(DWNMHDR*)evt->notify.pnmh;
- char ch;
int row = hdr.row;
xstring col = hdr.colname;
- xstring str = g_xdoc_shoppingcart.getData(0, L"data/Item", row, L"QuoteLineID");
+ xstring str = dwc_list.GetItemString(row, L"QuoteLineID");
if (str != L"")
str = L"ql:" + str;
else if (dwc_list.GetItemString(row, L"SKUNo") != L"")
@@ -1225,16 +1223,16 @@
DWNMHDR& hdr = *(DWNMHDR*)evt->notify.pnmh;
int row = hdr.row;
xstring ls_nos = L"ImportXml:";
- xstring str = g_xdoc_shoppingcart.getData(0, L"data/Item", row, L"SOLineID");
- xstring str1 = g_xdoc_shoppingcart.getData(0, L"data/Item", row, L"EnquiryPriceListID");
+ xstring str = dw_list.GetItemString(row, L"SOLineID");
+ xstring str1 =dw_list.GetItemString(row, L"EnquiryPriceListID");
if (str1 != L"")
str += L"el:" + str1;
else if (str != L"")
str = L"sl:" + str;
- else if (dwc_list.GetItemString(row, L"SKUNo") != L"")
- str = dwc_list.GetItemString(row, L"SKUNo");
+ else if (dw_list.GetItemString(row, L"SKUNo") != L"")
+ str = dw_list.GetItemString(row, L"SKUNo");
else
- str = dwc_list.GetItemString(row, L"No");
+ str = dw_list.GetItemString(row, L"No");
ls_nos += str;
dw_list.SelectRow(0, false);
@@ -1279,27 +1277,16 @@
dw_list = GetControl(L"dw_list");
dwc_list = GetControl(L"dwc_list");
- xaserverarg arg;
+ xaserverarg arg = GetArg();
CustomerID = L"";
CustomerName = L"";
hObject = 0;
if (arg)
{
- hObject = arg.GetArgString(L"HWND");
+ hObject = (HWND)arg.GetParam(L"HWND");
CustomerID = arg.GetArgString(L"CustomerID");
}
InitialFolder();
-
- g_xdoc_product = new xdataset;
- g_xdoc_product.Init();
- xbind bindproduct = new xbind;
- bindproduct.bindEx(dw_list, g_xdoc_product, L"");
-
- g_xdoc_shoppingcart = new xdataset;
- g_xdoc_shoppingcart.Init();
-
- xbind bindcart = new xbind;
- bindcart.bindEx(dwc_list, g_xdoc_shoppingcart, L"");
dw_list.SetDataObject(ProductLibraryView::GetMaintListForm3(L"").xml());
dw_list = GetControl(L"dw_list");
@@ -1314,8 +1301,6 @@
xs.SetContent(makeHtml(1));
}
- //xtreeview::ExpandItem(tv_folder.GetId(),
- // xtreeview::GetNextItem(tv_folder.GetId(),xtreeview::GetRootItem(tv_folder.GetId())));
tv_folder.ExpandItem(tv_folder.GetRootItem());
dw_list.SetSelectionMode(3);
--
Gitblit v1.9.3