From 9ac9cc9e9cd91b97d35a6e28400df71630765e40 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 21 八月 2024 14:35:51 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/Enquiry/Entity.Product.Select.cpp | 12 ++++++------
1 files changed, 6 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..268ae59 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;
@@ -848,8 +848,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;
}
@@ -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;
--
Gitblit v1.9.3