From 10e2964703614a03ec166a7e6702f3e3bb55c7d4 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期三, 24 七月 2024 17:53:42 +0800
Subject: [PATCH] update

---
 jrj/project/business/ProductSample/ProductNewItem.cpp          |    0 
 jrj/project/business/Enquiry/Entity.Product.Select.cpp         |    8 ++++----
 jrj/project/business/Enquiry/PriceList.PurcharItemSelectEx.cpp |    1 -
 jrj/project/vindexmenu.cpp                                     |    2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/jrj/project/business/Enquiry/Entity.Product.Select.cpp b/jrj/project/business/Enquiry/Entity.Product.Select.cpp
index 8aa60bb..99ce155 100644
--- a/jrj/project/business/Enquiry/Entity.Product.Select.cpp
+++ b/jrj/project/business/Enquiry/Entity.Product.Select.cpp
@@ -752,7 +752,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;
@@ -963,7 +963,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 +1358,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 +1388,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;
diff --git a/jrj/project/business/Enquiry/PriceList.PurcharItemSelectEx.cpp b/jrj/project/business/Enquiry/PriceList.PurcharItemSelectEx.cpp
index c5c8d58..fa1369a 100644
--- a/jrj/project/business/Enquiry/PriceList.PurcharItemSelectEx.cpp
+++ b/jrj/project/business/Enquiry/PriceList.PurcharItemSelectEx.cpp
@@ -119,7 +119,6 @@
 		int  OnRetrieve()
 		{
 			xml x ;
-			
 			xaserverarg  arg;
 			if (getUrl(L"/sale/data/Enquiry/folder/listitems", arg.GetString(), x) != 1)
 			{
diff --git a/jrj/project/business/ProductSample/ProductNewItem.cpp b/jrj/project/business/ProductSample/ProductNewItem.cpp
index 25cd8cf..1f0b244 100644
--- a/jrj/project/business/ProductSample/ProductNewItem.cpp
+++ b/jrj/project/business/ProductSample/ProductNewItem.cpp
Binary files differ
diff --git a/jrj/project/vindexmenu.cpp b/jrj/project/vindexmenu.cpp
index de87d5f..c8ebe19 100644
--- a/jrj/project/vindexmenu.cpp
+++ b/jrj/project/vindexmenu.cpp
@@ -370,7 +370,7 @@
 	int OnMenuAgent()
 	{
 		xstring s = L"menuAgent:Y";
-		SendMessage(m_nHwnd, 0x401, (LPARAM)s, 0);
+		SendMessage(m_nHwnd, 0x401, (LPARAM)s.c_str(), 0);
 		OnHideWin();
 		return 1;
 	}

--
Gitblit v1.9.3