From 94d3840bda13f23c0cd4619a99ac215b74ffcd94 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 07 十一月 2024 13:54:14 +0800
Subject: [PATCH] update

---
 jrj/project/business/Enquiry/Entity.Product.Select.cpp |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/jrj/project/business/Enquiry/Entity.Product.Select.cpp b/jrj/project/business/Enquiry/Entity.Product.Select.cpp
index 8aa60bb..4523de6 100644
--- a/jrj/project/business/Enquiry/Entity.Product.Select.cpp
+++ b/jrj/project/business/Enquiry/Entity.Product.Select.cpp
@@ -114,7 +114,7 @@
 			xml xp ;
 			
 			xaserverarg arg_pic;
-			arg_pic.setNativePointer(arg_pic.CreateInstance());
+			
 			arg_pic.AddArg(L"SKUID", skuid);
 			if (xurl::get(L"/sale/data/ProductLibrary3/pref/picture/imagelistSKU", arg_pic.GetString(), xp) != 1)
 			{
@@ -151,7 +151,7 @@
 			xml xp ;
 			
 			xaserverarg arg_pic;
-			arg_pic.setNativePointer(arg_pic.CreateInstance());
+			
 			arg_pic.AddArg(L"SKUID", skuid);
 			arg_pic.AddArg(L"CustomerID", m_customer);
 			arg_pic.AddArg(L"CustomerItemNo", customerItemNo);
@@ -318,6 +318,7 @@
 			xaserverarg arg;
 			
 			arg.AddArg(L"content", x.xml());
+			alert(x.xml());
 			if (xurl::get(L"/sale/data/ProductLibrary/image/update", arg.GetString(), x) != 1)
 			{
 				alert(x.text());
@@ -752,7 +753,7 @@
 			dw_list.Redraw();
 			impStr = L"";
 
-			SendMessage(hObject, 0x401, (LPARAM)ls_nos, 0);
+			SendMessage(hObject, 0x401, (LPARAM)ls_nos.c_str(), 0);
 			alert(L"转入完成!");
 
 			return 1;
@@ -831,7 +832,7 @@
 			HTREEITEM hItem = tv_folder.GetSelectedItem();
 			HTREEITEM hTopItem = LookupTopFolder(hItem);
 			xstring name = tv_folder.GetItemLabel(hTopItem);
-
+			if(name==L"") return 1;
 			KXMLDOMElement e = tv_folder.GetItemData(hItem);
 			xstring guid = e.getAttribute(L"guid");
 			if (guid == L"") return 1;
@@ -848,8 +849,8 @@
 			if (Name == L"") Name = e.getAttribute(L"cname");
 			arg.AddArg(L"No", No);
 			arg.AddArg(L"CName", Name);
-			int p = arg;
-			OpenWindow(L"dev:xpage[Quick.Input.NewProductEx.vx]", p);
+			
+			OpenWindow(L"dev:xpage[Quick.Input.NewProductEx.vx]", arg);
 			if (arg.GetArgString(L"data.modify") == L"1")RetrieveItem(hItem);
 			return 1;
 		}
@@ -869,15 +870,13 @@
 				OpenWindow(L"dev:xpage[PackSchemaMaint.goodslib.vx]");
 			}else
 			{
-				int pr = dw_list;
-				OpenWindow(L"dev:xpage[ProductLibraryItemMaint.vx]",pr);
+				OpenWindow(L"dev:xpage[ProductLibraryItemMaint.vx]",dw_list);
 			}
 			*/
 			//KXMLDOMElement ele = dw_list.getRowElement(L"data/Item", 1);
 			//alert(ele.xml);
 
-			int pr = dw_list;
-			OpenWindow(L"dev:xpage[ProductLibraryItemMaint3.vx]", pr);
+			OpenWindow(L"dev:xpage[ProductLibraryItemMaint3.vx]", dw_list);
 
 			return 1;
 		}
@@ -963,7 +962,7 @@
 		}
 		int MakeGoodCarFolderItem(HTREEITEM hItem)
 		{
-			xml x = ShoppingCartView::GetRoleList();
+			xml x = ShoppingCartView::GetSupplierRoleList(SupplierID);
 			if (!x) return 0;
 			KXMLDOMNodeList nlist = x.selectNodes(L"/data/item");
 			int len = nlist.length();
@@ -1358,7 +1357,7 @@
 			dw_list.Redraw();
 			dwc_list.Redraw();
 			impStr = L"";
-			SendMessage(hObject, 0x401, (LPARAM)ls_nos, 0);
+			SendMessage(hObject, 0x401, (LPARAM)ls_nos.c_str(), 0);
 			xutil::RestoreCursor(hCursor);
 			CloseWindow();
 			return 1;
@@ -1388,7 +1387,7 @@
 			dw_list.Redraw();
 			dwc_list.Redraw();
 			impStr = L"";
-			SendMessage(hObject, 0x401, (LPARAM)ls_nos, 0);
+			SendMessage(hObject, 0x401, (LPARAM)ls_nos.c_str(), 0);
 			xutil::RestoreCursor(hCursor);
 			CloseWindow();
 			return 1;

--
Gitblit v1.9.3