From fc061fbbad7f22901356b4fd8bd77db372a0d465 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期三, 11 九月 2024 18:13:36 +0800
Subject: [PATCH] update
---
jrj/project/total3/ViewTotalWin.cpp | 2 +-
jrj/project/business/GDN3.list.cpp | 6 +++---
jrj/project/business/PO/Maint.PurcherItem.cpp | 0
jrj/project/business/Quote3.maint.cpp | 0
jrj/project/business/Enquiry.list.cpp | 4 +++-
jrj/project/business/PO/Maint.PaperCard.PO.hpp | 0
jrj/project/business/Public/memo.edit.new.cpp | 0
jrj/project/total3/viewex.total.cpp | 2 +-
jrj/project/business/EnquiryEx3.list.cpp | 0
jrj/project/business/Customer3.maint.cpp | 11 ++++++-----
jrj/project/business/Enquiry/Enquiry.maint.cpp | 3 ++-
jrj/project/business/SO3.list.cpp | 2 +-
jrj/project/business/Expense/SampleRequestForm.cpp | 0
13 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/jrj/project/business/Customer3.maint.cpp b/jrj/project/business/Customer3.maint.cpp
index 42305ad..4ec034b 100644
--- a/jrj/project/business/Customer3.maint.cpp
+++ b/jrj/project/business/Customer3.maint.cpp
@@ -821,10 +821,9 @@
{
Content=t.selectSingleNode(L"Content").text();
}
- xaserverarg& arg1 = * new xaserverarg;
- arg1.setNativePointer(arg1.CreateInstance());
+ xaserverarg arg1;
arg1.AddArg(L"value",Content);
- OpenWindow(L"dev:xpage[memo.edit.new.vx]",(LPARAM) & arg1);
+ OpenWindow(L"dev:xpage[memo.edit.new.vx]",arg1);
return 1;
}
@@ -897,10 +896,11 @@
}
if(value == L"客户基本信息")
{
- xaserverarg& arg1 = *new xaserverarg;
+ xaserverarg arg1 = GetArg();
xstring str = dw_detail.GetItemString(1,L"BasicInformation");
arg1.AddArg(L"value",str);
- OpenWindow(L"dev:xpage[memo.edit.new.vx]", (LPARAM)&arg1);
+ OpenWindow(L"dev:xpage[memo.edit.new.vx]", arg1);
+
if(arg1.GetArgString(L"comdid")==L"xmOK")
{
str = arg1.GetArgString(L"value");
@@ -1115,6 +1115,7 @@
int onloaded()
{
+ SetArg();
APP=1;
maint::onloaded();
diff --git a/jrj/project/business/Enquiry.list.cpp b/jrj/project/business/Enquiry.list.cpp
index 40dc29e..dc72830 100644
--- a/jrj/project/business/Enquiry.list.cpp
+++ b/jrj/project/business/Enquiry.list.cpp
@@ -1023,12 +1023,13 @@
int OnTech(xdwgrid dw_term)
{
- xaserverarg arg;
+ xaserverarg arg=GetArg();
int row = dw_term.GetRow();
if(row < 1) return 0;
xstring str = dw_term.GetItemString(row,L"TechNote");
arg.AddArg(L"value",str);
OpenWindow(L"dev:xpage[memo.edit.new.vx]",arg);
+
if(arg.GetArgString(L"comdid")==L"xmOK")
{
str = arg.GetArgString(L"value");
@@ -1515,6 +1516,7 @@
}
int onload()
{
+ SetArg();
state1=-1;
state2=-1;
diff --git a/jrj/project/business/Enquiry/Enquiry.maint.cpp b/jrj/project/business/Enquiry/Enquiry.maint.cpp
index 030fdc9..0ddb9cc 100644
--- a/jrj/project/business/Enquiry/Enquiry.maint.cpp
+++ b/jrj/project/business/Enquiry/Enquiry.maint.cpp
@@ -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");
diff --git a/jrj/project/business/EnquiryEx3.list.cpp b/jrj/project/business/EnquiryEx3.list.cpp
index 515d0fd..e86cc86 100644
--- a/jrj/project/business/EnquiryEx3.list.cpp
+++ b/jrj/project/business/EnquiryEx3.list.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/SampleRequestForm.cpp b/jrj/project/business/Expense/SampleRequestForm.cpp
index 0058041..a5a0e7d 100644
--- a/jrj/project/business/Expense/SampleRequestForm.cpp
+++ b/jrj/project/business/Expense/SampleRequestForm.cpp
Binary files differ
diff --git a/jrj/project/business/GDN3.list.cpp b/jrj/project/business/GDN3.list.cpp
index e59079b..cffb2b8 100644
--- a/jrj/project/business/GDN3.list.cpp
+++ b/jrj/project/business/GDN3.list.cpp
@@ -514,10 +514,10 @@
{
Content = t.selectSingleNode(L"Content").text();
}
- xaserverarg& arg1 = *new xaserverarg;
- arg1.setNativePointer(arg1.CreateInstance());
+ xaserverarg arg1 ;
+
arg1.AddArg(L"value", Content);
- OpenWindow(L"dev:xpage[memo.edit.new.vx]", (LPARAM)&arg1);
+ OpenWindow(L"dev:xpage[memo.edit.new.vx]",arg1);
return 1;
}
diff --git a/jrj/project/business/PO/Maint.PaperCard.PO.hpp b/jrj/project/business/PO/Maint.PaperCard.PO.hpp
index f268fa3..ae7fe7b 100644
--- a/jrj/project/business/PO/Maint.PaperCard.PO.hpp
+++ b/jrj/project/business/PO/Maint.PaperCard.PO.hpp
Binary files differ
diff --git a/jrj/project/business/PO/Maint.PurcherItem.cpp b/jrj/project/business/PO/Maint.PurcherItem.cpp
index 005942c..d449f5f 100644
--- a/jrj/project/business/PO/Maint.PurcherItem.cpp
+++ b/jrj/project/business/PO/Maint.PurcherItem.cpp
Binary files differ
diff --git a/jrj/project/business/Public/memo.edit.new.cpp b/jrj/project/business/Public/memo.edit.new.cpp
index f9efb1f..35e3cfc 100644
--- a/jrj/project/business/Public/memo.edit.new.cpp
+++ b/jrj/project/business/Public/memo.edit.new.cpp
Binary files differ
diff --git a/jrj/project/business/Quote3.maint.cpp b/jrj/project/business/Quote3.maint.cpp
index 4fcf923..2840619 100644
--- a/jrj/project/business/Quote3.maint.cpp
+++ b/jrj/project/business/Quote3.maint.cpp
Binary files differ
diff --git a/jrj/project/business/SO3.list.cpp b/jrj/project/business/SO3.list.cpp
index 8f92f1c..37f3286 100644
--- a/jrj/project/business/SO3.list.cpp
+++ b/jrj/project/business/SO3.list.cpp
@@ -359,7 +359,7 @@
{
Content = t.selectSingleNode(L"Content").text();
}
- xaserverarg& arg = *new xaserverarg;
+ xaserverarg arg;
arg.AddArg(L"value", Content);
OpenWindow(L"dev:xpage[memo.edit.new.vx]", arg);
diff --git a/jrj/project/total3/ViewTotalWin.cpp b/jrj/project/total3/ViewTotalWin.cpp
index b5613e5..e74b37f 100644
--- a/jrj/project/total3/ViewTotalWin.cpp
+++ b/jrj/project/total3/ViewTotalWin.cpp
@@ -119,7 +119,7 @@
Content = t.selectSingleNode(L"Content").text();
}
- xaserverarg arg1 ;
+ xaserverarg arg1 =GetArg();
arg1.AddArg(L"value", Content);
OpenWindow(L"dev:xpage[memo.edit.new.vx]", arg1);
return 1;
diff --git a/jrj/project/total3/viewex.total.cpp b/jrj/project/total3/viewex.total.cpp
index 7fddd3b..2477d0c 100644
--- a/jrj/project/total3/viewex.total.cpp
+++ b/jrj/project/total3/viewex.total.cpp
@@ -100,7 +100,7 @@
Content = t.selectSingleNode(L"Content").text();
}
- xaserverarg arg1 ;
+ xaserverarg arg1=GetArg() ;
arg1.AddArg(L"value", Content);
OpenWindow(L"dev:xpage[memo.edit.new.vx]", arg1);
--
Gitblit v1.9.3