From cb55b0e814bd30b3b3d1842b61898ae6916f83ed Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 19 七月 2024 13:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/SO3.maint.cpp | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/jrj/project/business/SO3.maint.cpp b/jrj/project/business/SO3.maint.cpp
index 53b8fa6..5bb3ca6 100644
--- a/jrj/project/business/SO3.maint.cpp
+++ b/jrj/project/business/SO3.maint.cpp
@@ -609,11 +609,10 @@
//str = str.trim();
//if(str==L"")
//{
- xaserverarg& arg = *new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
- arg.AddArg(L"HWND", xstring((__int64)GetHWND()));
+ xaserverarg arg;
+ arg.SetParam(L"HWND", GetHWND());
arg.AddArg(L"CustomerID", dw_base.GetItemString(1, L"CustomerID"));
- OpenWindow(L"dev:xpage[Product.Select.SO.vx]", (LPARAM)&arg);
+ OpenWindow(L"dev:xpage[Product.Select.SO.vx]", arg);
//OpenWindow(L"dev:xpage[Product.Select.vx]",cast(arg1 as int));
//}
//else
@@ -1001,12 +1000,12 @@
}*/
xstring SONo;
xstring CustomerID;
- xaserverarg* arg = 0;
- if (GetParam())
+ xaserverarg arg;
+ if (GetWinParam())
{
- arg = (xaserverarg *)GetParam();
- SONo = arg->GetArgString(L"SONo");
- if (SONo == L"") SONo = arg->GetArgString(L"EntityNo");
+ arg = GetArg();
+ SONo = arg.GetArgString(L"SONo");
+ if (SONo == L"") SONo = arg.GetArgString(L"EntityNo");
}
if (SONo != L"")
{
@@ -1046,8 +1045,8 @@
if (CustomerID != L"")
{
- dw_base.ItemChangeTo(1, L"CustomerID", arg->GetArgString(L"CustomerID"));
- dw_base.SetItemDisplayString(1, L"CustomerID", arg->GetArgString(L"CustomerName"));
+ dw_base.ItemChangeTo(1, L"CustomerID", arg.GetArgString(L"CustomerID"));
+ dw_base.SetItemDisplayString(1, L"CustomerID", arg.GetArgString(L"CustomerName"));
xstring dwname = L"dw_base";
xstring colname = L"CustomerID";
xstring value = CustomerID;
@@ -1065,9 +1064,9 @@
{
SetAgent();
- if (GetParam())
+ if (GetWinParam())
{
- xaserverarg& arg = *(xaserverarg * )GetParam();
+ xaserverarg arg = GetArg();
HCURSOR hCursor = xutil::SetCursorWait();
xstring SONo = arg.GetArgString(L"SONo");
if (SONo == L"") SONo = arg.GetArgString(L"EntityNo");
--
Gitblit v1.9.3