From 15d1eebb57ee9f2dcae0750408ecd308c60b771f Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 02 七月 2024 18:26:20 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/SO/Product.Select.SO.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jrj/project/business/SO/Product.Select.SO.cpp b/jrj/project/business/SO/Product.Select.SO.cpp
index be4bddb..f59552d 100644
--- a/jrj/project/business/SO/Product.Select.SO.cpp
+++ b/jrj/project/business/SO/Product.Select.SO.cpp
@@ -672,7 +672,7 @@
 			dw_list.Redraw();
 			impStr = L"";
 
-			SendMessageW(hObject, 0x401, ls_nos, 0);
+			SendMessage(hObject, 0x401, ls_nos, 0);
 			alert(L"转入完成!");
 			return 1;
 		}
@@ -833,7 +833,7 @@
 			}
 			else if (comdid == L"xmRertieve")
 			{
-				int hItem1 = tv_folder.GetSelectedItem();
+				HTREEITEM hItem1 = tv_folder.GetSelectedItem();
 				KXMLDOMElement e2 = tv_folder.GetItemData(hItem1);
 				xstring no1 = e2.getAttribute(L"no");
 				xml x2 = vcontrol::RetrieveData(L"/sale/data/SO/goods/usergoods/listex1", L"parent", no1);
@@ -1035,7 +1035,7 @@
 
 			xcontrol query = GetControl(L"sl_search");
 			xstring queryString = query.GetText();
-
+			xshtml xs;
 			if (name == L"购物车")
 			{
 				if (agentFor != L"goodscar")SwitchLayer(L"goodscarsheet", L"sheetframe");
@@ -1105,7 +1105,7 @@
 						no = e.getAttribute(L"guid");
 					}
 
-					dw_list.SetDataObject(ProductLibraryView::GetMaintListForm3(no).GetXmlDoc());
+					dw_list.SetDataObject(ProductLibraryView::GetMaintListForm3(no).xml());
 					dw_list = GetControl(L"dw_list");
 					dw_list.SetReadOnly(true);
 

--
Gitblit v1.9.3