From e09a044ccb0bf15c498da39e5954827456e677e1 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 13 九月 2024 16:25:51 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/Enquiry/Enquiry.maint.cpp | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/jrj/project/business/Enquiry/Enquiry.maint.cpp b/jrj/project/business/Enquiry/Enquiry.maint.cpp
index 8bbc0a0..659422b 100644
--- a/jrj/project/business/Enquiry/Enquiry.maint.cpp
+++ b/jrj/project/business/Enquiry/Enquiry.maint.cpp
@@ -195,7 +195,7 @@
Packing = dw_goods.GetItemString(i,L"Packing");
if(Packings==L"")
Packings = Packing;
- else if(Packings.find(Packing) < 0) Packings+=L",L"+Packing;
+ else if(Packings.find(Packing) < 0) Packings+=L","+Packing;
}*/
if (dw_goods.GetItemString(i, L"Packing") == L"")
{
@@ -389,7 +389,7 @@
Packing = dw_goods.GetItemString(i, L"Packing");
if (Packings == L"")
Packings = Packing;
- else if (Packings.find(Packing) < 0) Packings += L",L" + Packing;
+ else if (Packings.find(Packing) < 0) Packings += L"," + Packing;
}
}
@@ -918,7 +918,7 @@
if (i == 1)
skunos = skuno;
else
- skunos += L",L" + skuno;
+ skunos += L"," + skuno;
}
xaserverarg arg_pic;
@@ -938,7 +938,7 @@
xml xp ;
xaserverarg arg_pic;
- arg_pic.setNativePointer(arg_pic.CreateInstance());
+
arg_pic.AddArg(L"SKUNo", skuno);
xstring res = L"/sale/data/ProductLibrary3/pref/picture/imagelistSKUNo";
@@ -1046,7 +1046,7 @@
if (skunos == L"")
skunos = dw_goods.GetItemString(i, L"SKUNo");
else
- skunos += L",L" + dw_goods.GetItemString(i, L"SKUNo");
+ skunos += L"," + dw_goods.GetItemString(i, L"SKUNo");
}
}
xaserverarg arg ;
@@ -1077,7 +1077,7 @@
if (str == L"")
{
xaserverarg arg1;
- arg1.setNativePointer(arg1.CreateInstance());
+
arg1.SetParam(L"HWND", GetHWND());
arg1.AddArg(L"CustomerID", dw_base.GetItemString(1, L"CustomerID"));
OpenWindow(L"dev:xpage[Entity.Product.Select.vx]",arg1);
@@ -1127,13 +1127,14 @@
}
else if (comdid == L"xmProductDesc")
{
- xaserverarg arg2;
+ xaserverarg arg2=GetArg();
int row2 = dw_goods.GetRow();
if (row2 < 1) return 0;
xstring str2 = dw_goods.GetItemString(row2, L"ProductDesc");
arg2.AddArg(L"value", str2);
OpenWindow(L"dev:xpage[memo.edit.new.vx]", arg2);
+
if (arg2.GetArgString(L"comdid") == L"xmOK")
{
str2 = arg2.GetArgString(L"value");
@@ -1159,7 +1160,7 @@
dw_goods.SetItemDisplayString(nRow, L"KOPCode", L"CTNS");
xaserverarg arg3;
- arg3.setNativePointer(arg3.CreateInstance());
+
int row3 = dw_goods.GetRow();
if (row3 < 1) return 0;
dw_goods.SetItemString(nRow, L"SKUNo", dw_goods.GetItemString(row3, L"SKUNo"));
--
Gitblit v1.9.3