From 82d21bb5c6d0dedc5599a5cf61d19c7eee1f7ef5 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期一, 08 七月 2024 10:03:44 +0800
Subject: [PATCH] update
---
jrj/project/business/SO/Product.Select.SO.cpp | 1 +
jrj/project/business/SO/Product.FetchNo.cpp | 1 +
jrj/project/business/HR/ManpowerFileWindow.cpp | 1 +
jrj/project/business/GDN/SelectItem.New.GDN.cpp | 0
jrj/project/business/GDN/GDNSourcePaperCard.cpp | 0
jrj/project/business/PO/Maint.PurcherItem.cpp | 0
jrj/project/business/Public/SupplierUserGroupPersonSelect.cpp | 1 +
jrj/project/business/VATNotify/simple.maint.vatnotify.cpp | 1 +
jrj/project/business/Public/UserGroupPersonSelectEx.cpp | 1 +
jrj/project/business/PO/Maint.PaperCard.PO.cpp | 0
jrj/project/business/VATNotify/VATNotifyParse.cpp | 1 +
jrj/project/business/SO/paymentterm.base.maint.so.cpp | 1 +
jrj/project/business/Supplier/maint.Owner.Supplier.cpp | 0
jrj/project/business/SO/select.item.so.cpp | 1 +
jrj/project/business/PO/Habit.PO.cpp | 0
jrj/project/business/Public/UserGroupPersonSelect.cpp | 1 +
jrj/project/business/Public/UserGroupShareEx.cpp | 1 +
jrj/project/business/AR/Deduction.cpp | 3 ++-
jrj/project/business/AR/CustomerTran.AR.cpp | 7 ++++---
jrj/project/business/PO/paperImage.cpp | 0
jrj/project/business/VATNotify/maint.papercard.vatnotify.cpp | 1 +
jrj/project/business/PO/InsertPO.PO.cpp | 0
jrj/project/business/AR/maint.SettlementExchange.cpp | 1 +
jrj/project/business/HR/AdministrativeDepartmentFolder.cpp | 2 +-
jrj/project/business/PO/PO.maint.base.cpp | 0
jrj/project/business/SO/delivery.base.maint.so.cpp | 1 +
jrj/project/business/PO/MakeAllPOEx.PO.cpp | 0
jrj/project/business/Public/UserGroupShare.cpp | 1 +
jrj/project/business/VATNotify/update.vatnotify.cpp | 1 +
jrj/project/business/AP/Select.AP.cpp | 1 +
jrj/project/business/AR/ExchangeSignFast.cpp | 1 +
jrj/project/business/Public/UserGroupSelect.cpp | 1 +
jrj/project/business/Public/search.dialog.cpp | 1 +
jrj/project/business/AP/maint.ap.cpp | 1 +
jrj/project/business/Supplier/Inspection.Supplie.cpp | 0
jrj/project/business/GDN/GDNSourcePriceMaint.cpp | 0
jrj/project/business/GDN/select.item.po.cpp | 0
jrj/project/business/AR/ExchageFile.cpp | 10 +++++-----
jrj/project/business/Public/message.business.cpp | 0
39 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/jrj/project/business/AP/Select.AP.cpp b/jrj/project/business/AP/Select.AP.cpp
index 25acc97..44a979b 100644
--- a/jrj/project/business/AP/Select.AP.cpp
+++ b/jrj/project/business/AP/Select.AP.cpp
@@ -110,6 +110,7 @@
int onload()
{
+ SetArg();
dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"/sale/view/PurchaseOrder/template/purchaseorder/POAdvance");
OnAttachEvent();
diff --git a/jrj/project/business/AP/maint.ap.cpp b/jrj/project/business/AP/maint.ap.cpp
index 3c173ed..ae45d3e 100644
--- a/jrj/project/business/AP/maint.ap.cpp
+++ b/jrj/project/business/AP/maint.ap.cpp
@@ -251,6 +251,7 @@
int onload()
{
+ SetArg();
APID = L"";
APType = L"";
if (GetWinParam())
diff --git a/jrj/project/business/AR/CustomerTran.AR.cpp b/jrj/project/business/AR/CustomerTran.AR.cpp
index 3b8d3e4..6c80af8 100644
--- a/jrj/project/business/AR/CustomerTran.AR.cpp
+++ b/jrj/project/business/AR/CustomerTran.AR.cpp
@@ -132,7 +132,7 @@
xml x;
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
dw_list.DwUpdateAllToEx(x);
arg.AddArg(L"content", x.xml());
if (getUrl(L"/sale/data/AR/update/tran/customer", arg.GetString(), x) != 1)
@@ -152,8 +152,8 @@
{
xml x;
- xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg =GetArg();
+
if (getUrl(L"/sale/data/AR/tran/customer", arg.GetString(), x) != 1)
{
trace(x.text());
@@ -169,6 +169,7 @@
int onload()
{
+ SetArg();
dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"/sale/view/AR/template/customertran");
dw_list.SetAskStyle(true);
diff --git a/jrj/project/business/AR/Deduction.cpp b/jrj/project/business/AR/Deduction.cpp
index fa0e386..4c29afa 100644
--- a/jrj/project/business/AR/Deduction.cpp
+++ b/jrj/project/business/AR/Deduction.cpp
@@ -159,7 +159,7 @@
xml x;
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"InvoiceNo", InvoiceNo);
arg.AddArg(L"InvoiceNoEx", GetControl(L"search").GetText());
arg.AddArg(L"EntityID", EntityID);
@@ -181,6 +181,7 @@
int onload()
{
+ SetArg();
dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"/sale/view/AR/template/Deduction");
diff --git a/jrj/project/business/AR/ExchageFile.cpp b/jrj/project/business/AR/ExchageFile.cpp
index 1516d05..34ba750 100644
--- a/jrj/project/business/AR/ExchageFile.cpp
+++ b/jrj/project/business/AR/ExchageFile.cpp
@@ -318,9 +318,9 @@
if (filename == L"" || saveas)
{
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"src", L"data/SettleExchange");
- OpenWindow(L"dev:xpage[trade.document.saveas.vx]", cast(arg as int));
+ OpenWindow(L"dev:xpage[trade.document.saveas.vx]",arg);
if (arg.GetArgString(L"result") == L"ok")
{
sfilename = arg.GetArgString(L"filename");
@@ -346,7 +346,7 @@
xml x;
xaserverarg args ;
- args.setNativePointer(args.CreateInstance());
+
args.AddArg(L"myurl", myurl);
args.AddArg(L"name", sfilename);
args.AddArg(L"filepath", sname);
@@ -383,10 +383,10 @@
if (comdid == L"xmFileOpen")
{
xaserverarg args ;
- args.setNativePointer(args.CreateInstance());
+
args.AddArg(L"src", L"data/SettleExchange");
args.AddArg(L"process", L"path");
- OpenWindow(L"dev:xpage[trade.document.selectdlg.vx]", cast(args as int));
+ OpenWindow(L"dev:xpage[trade.document.selectdlg.vx]",args);
if (args.GetArgString(L"result") == L"ok")
{
xstring u = args.GetArgString(L"src");
diff --git a/jrj/project/business/AR/ExchangeSignFast.cpp b/jrj/project/business/AR/ExchangeSignFast.cpp
index b285ad1..8084cea 100644
--- a/jrj/project/business/AR/ExchangeSignFast.cpp
+++ b/jrj/project/business/AR/ExchangeSignFast.cpp
@@ -382,6 +382,7 @@
int onload()
{
+ SetArg();
dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"/sale/view/AR/template/unexch");
dw_unexch = GetControl(L"dw_unexch");
diff --git a/jrj/project/business/AR/maint.SettlementExchange.cpp b/jrj/project/business/AR/maint.SettlementExchange.cpp
index 9182934..9785b86 100644
--- a/jrj/project/business/AR/maint.SettlementExchange.cpp
+++ b/jrj/project/business/AR/maint.SettlementExchange.cpp
@@ -202,6 +202,7 @@
}
int onload()
{
+ SetArg();
dw_base = GetControl(L"dw_base");
dw_base.openUrl(L"/sale/view/AR/template/SEMaint");
dw_base.SetColHeaderHeight(0);
diff --git a/jrj/project/business/GDN/GDNSourcePaperCard.cpp b/jrj/project/business/GDN/GDNSourcePaperCard.cpp
index 8399df6..8fbe206 100644
--- a/jrj/project/business/GDN/GDNSourcePaperCard.cpp
+++ b/jrj/project/business/GDN/GDNSourcePaperCard.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/GDNSourcePriceMaint.cpp b/jrj/project/business/GDN/GDNSourcePriceMaint.cpp
index 3ae1119..b9cc11e 100644
--- a/jrj/project/business/GDN/GDNSourcePriceMaint.cpp
+++ b/jrj/project/business/GDN/GDNSourcePriceMaint.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/SelectItem.New.GDN.cpp b/jrj/project/business/GDN/SelectItem.New.GDN.cpp
index fd9342e..e48891c 100644
--- a/jrj/project/business/GDN/SelectItem.New.GDN.cpp
+++ b/jrj/project/business/GDN/SelectItem.New.GDN.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/select.item.po.cpp b/jrj/project/business/GDN/select.item.po.cpp
index 2c76b35..4a1c635 100644
--- a/jrj/project/business/GDN/select.item.po.cpp
+++ b/jrj/project/business/GDN/select.item.po.cpp
Binary files differ
diff --git a/jrj/project/business/HR/AdministrativeDepartmentFolder.cpp b/jrj/project/business/HR/AdministrativeDepartmentFolder.cpp
index 103a4e1..0a18db0 100644
--- a/jrj/project/business/HR/AdministrativeDepartmentFolder.cpp
+++ b/jrj/project/business/HR/AdministrativeDepartmentFolder.cpp
@@ -173,7 +173,7 @@
int onload()
{
-
+ SetArg();
dw_base = GetControl(L"dw_base");
dw_base.openUrl(L"/sale/view/AdministrativeDepartment/template/adwin");
getsingle_url = L"/sale/data/AdministrativeDepartment/ad_getsingle";
diff --git a/jrj/project/business/HR/ManpowerFileWindow.cpp b/jrj/project/business/HR/ManpowerFileWindow.cpp
index 5dd1602..f6582f0 100644
--- a/jrj/project/business/HR/ManpowerFileWindow.cpp
+++ b/jrj/project/business/HR/ManpowerFileWindow.cpp
@@ -162,6 +162,7 @@
int onload()
{
+ SetArg();
dw_base = GetControl(L"dw_base");
dw_base.openUrl(L"/sale/view/ManpowerFile/template/win");
mfid = L"";
diff --git a/jrj/project/business/PO/Habit.PO.cpp b/jrj/project/business/PO/Habit.PO.cpp
index 4147d20..5483786 100644
--- a/jrj/project/business/PO/Habit.PO.cpp
+++ b/jrj/project/business/PO/Habit.PO.cpp
Binary files differ
diff --git a/jrj/project/business/PO/InsertPO.PO.cpp b/jrj/project/business/PO/InsertPO.PO.cpp
index b6fb4b4..3d2ed63 100644
--- a/jrj/project/business/PO/InsertPO.PO.cpp
+++ b/jrj/project/business/PO/InsertPO.PO.cpp
Binary files differ
diff --git a/jrj/project/business/PO/Maint.PaperCard.PO.cpp b/jrj/project/business/PO/Maint.PaperCard.PO.cpp
index 2f5741d..94d5d6d 100644
--- a/jrj/project/business/PO/Maint.PaperCard.PO.cpp
+++ b/jrj/project/business/PO/Maint.PaperCard.PO.cpp
Binary files differ
diff --git a/jrj/project/business/PO/Maint.PurcherItem.cpp b/jrj/project/business/PO/Maint.PurcherItem.cpp
index 3bc760c..cc627bd 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/PO/MakeAllPOEx.PO.cpp b/jrj/project/business/PO/MakeAllPOEx.PO.cpp
index c587cf7..a828194 100644
--- a/jrj/project/business/PO/MakeAllPOEx.PO.cpp
+++ b/jrj/project/business/PO/MakeAllPOEx.PO.cpp
Binary files differ
diff --git a/jrj/project/business/PO/PO.maint.base.cpp b/jrj/project/business/PO/PO.maint.base.cpp
index debf01b..2351139 100644
--- a/jrj/project/business/PO/PO.maint.base.cpp
+++ b/jrj/project/business/PO/PO.maint.base.cpp
Binary files differ
diff --git a/jrj/project/business/PO/paperImage.cpp b/jrj/project/business/PO/paperImage.cpp
index 7df8087..b56a72c 100644
--- a/jrj/project/business/PO/paperImage.cpp
+++ b/jrj/project/business/PO/paperImage.cpp
Binary files differ
diff --git a/jrj/project/business/Public/SupplierUserGroupPersonSelect.cpp b/jrj/project/business/Public/SupplierUserGroupPersonSelect.cpp
index b7d0a22..6f7ed14 100644
--- a/jrj/project/business/Public/SupplierUserGroupPersonSelect.cpp
+++ b/jrj/project/business/Public/SupplierUserGroupPersonSelect.cpp
@@ -138,6 +138,7 @@
int onload()
{
+ SetArg();
dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"组织架构.vface/template/HrEmployee/PersonSel");
dw_list.SetSelectionMode(3);
diff --git a/jrj/project/business/Public/UserGroupPersonSelect.cpp b/jrj/project/business/Public/UserGroupPersonSelect.cpp
index 739febc..5ed2e0f 100644
--- a/jrj/project/business/Public/UserGroupPersonSelect.cpp
+++ b/jrj/project/business/Public/UserGroupPersonSelect.cpp
@@ -138,6 +138,7 @@
int onload()
{
+ SetArg();
dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"组织架构.vface/template/HrEmployee/PersonSel");
dw_list.SetSelectionMode(3);
diff --git a/jrj/project/business/Public/UserGroupPersonSelectEx.cpp b/jrj/project/business/Public/UserGroupPersonSelectEx.cpp
index 679dda9..42bffaf 100644
--- a/jrj/project/business/Public/UserGroupPersonSelectEx.cpp
+++ b/jrj/project/business/Public/UserGroupPersonSelectEx.cpp
@@ -138,6 +138,7 @@
int onload()
{
+ SetArg();
dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"组织架构.vface/template/HrEmployee/PersonSel");
dw_list.SetSelectionMode(3);
diff --git a/jrj/project/business/Public/UserGroupSelect.cpp b/jrj/project/business/Public/UserGroupSelect.cpp
index 6bb35a4..10790d0 100644
--- a/jrj/project/business/Public/UserGroupSelect.cpp
+++ b/jrj/project/business/Public/UserGroupSelect.cpp
@@ -135,6 +135,7 @@
int onload()
{
+ SetArg();
dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"/sale/view/UserGroup/template/list");
dw_list.SetSelectionMode(3);
diff --git a/jrj/project/business/Public/UserGroupShare.cpp b/jrj/project/business/Public/UserGroupShare.cpp
index 1d5e79f..78570a8 100644
--- a/jrj/project/business/Public/UserGroupShare.cpp
+++ b/jrj/project/business/Public/UserGroupShare.cpp
@@ -275,6 +275,7 @@
int onload()
{
+ SetArg();
dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"/sale/view/UserGroup/template/entityusergrouplist");
dw_list.SetReadOnly(true);
diff --git a/jrj/project/business/Public/UserGroupShareEx.cpp b/jrj/project/business/Public/UserGroupShareEx.cpp
index c4d62bf..64a292b 100644
--- a/jrj/project/business/Public/UserGroupShareEx.cpp
+++ b/jrj/project/business/Public/UserGroupShareEx.cpp
@@ -134,6 +134,7 @@
int onload()
{
+ SetArg();
dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"/sale/view/UserGroup/template/entityusergrouplist");
dw_list.SetReadOnly(true);
diff --git a/jrj/project/business/Public/message.business.cpp b/jrj/project/business/Public/message.business.cpp
index cf22837..0b3036f 100644
--- a/jrj/project/business/Public/message.business.cpp
+++ b/jrj/project/business/Public/message.business.cpp
Binary files differ
diff --git a/jrj/project/business/Public/search.dialog.cpp b/jrj/project/business/Public/search.dialog.cpp
index 209908a..2bd1abc 100644
--- a/jrj/project/business/Public/search.dialog.cpp
+++ b/jrj/project/business/Public/search.dialog.cpp
@@ -89,6 +89,7 @@
int onload()
{
+ SetArg();
sle_1 = GetControl(L"sl_search");
int x = GetWindowLong(GetHWND(), -16); //GWL_STYLE
x = x + 0x0008;
diff --git a/jrj/project/business/SO/Product.FetchNo.cpp b/jrj/project/business/SO/Product.FetchNo.cpp
index 0c0808f..549a563 100644
--- a/jrj/project/business/SO/Product.FetchNo.cpp
+++ b/jrj/project/business/SO/Product.FetchNo.cpp
@@ -301,6 +301,7 @@
int onload()
{
+ SetArg();
dw_list = GetControl(L"dw_list");
dw_list.SetDataObject(ProductLibraryView::GetMaintListForm3(L"").xml());
dw_list.SetColumnState(L"SKUID", false);
diff --git a/jrj/project/business/SO/Product.Select.SO.cpp b/jrj/project/business/SO/Product.Select.SO.cpp
index e8f517c..5089eeb 100644
--- a/jrj/project/business/SO/Product.Select.SO.cpp
+++ b/jrj/project/business/SO/Product.Select.SO.cpp
@@ -1270,6 +1270,7 @@
int onload()
{
+ SetArg();
agentFor = L"goodslib";
OnAttachEvent();
diff --git a/jrj/project/business/SO/delivery.base.maint.so.cpp b/jrj/project/business/SO/delivery.base.maint.so.cpp
index 4e373c9..cb56b16 100644
--- a/jrj/project/business/SO/delivery.base.maint.so.cpp
+++ b/jrj/project/business/SO/delivery.base.maint.so.cpp
@@ -174,6 +174,7 @@
int onload()
{
+ SetArg();
dw_1 = GetControl(L"dw_1");
dw_1.openUrl(L"/sale/view/SaleOrder/template/delivery"); //base.maint.so.tpl/delivery
dw_1.SetColHeaderHeight(0);
diff --git a/jrj/project/business/SO/paymentterm.base.maint.so.cpp b/jrj/project/business/SO/paymentterm.base.maint.so.cpp
index 1f8a420..dd42b0b 100644
--- a/jrj/project/business/SO/paymentterm.base.maint.so.cpp
+++ b/jrj/project/business/SO/paymentterm.base.maint.so.cpp
@@ -375,6 +375,7 @@
int onload()
{
+ SetArg();
dw_1 = GetControl(L"dw_1");
dw_1.openUrl(L"/sale/view/SaleOrder/template/payment"); //base.maint.so.tpl/payment
diff --git a/jrj/project/business/SO/select.item.so.cpp b/jrj/project/business/SO/select.item.so.cpp
index 0111841..692c54c 100644
--- a/jrj/project/business/SO/select.item.so.cpp
+++ b/jrj/project/business/SO/select.item.so.cpp
@@ -115,6 +115,7 @@
int onload()
{
+ SetArg();
dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"/sale/view/SaleOrder/template/item");
diff --git a/jrj/project/business/Supplier/Inspection.Supplie.cpp b/jrj/project/business/Supplier/Inspection.Supplie.cpp
index 16b98b3..10a131b 100644
--- a/jrj/project/business/Supplier/Inspection.Supplie.cpp
+++ b/jrj/project/business/Supplier/Inspection.Supplie.cpp
Binary files differ
diff --git a/jrj/project/business/Supplier/maint.Owner.Supplier.cpp b/jrj/project/business/Supplier/maint.Owner.Supplier.cpp
index 55a86bd..149d03c 100644
--- a/jrj/project/business/Supplier/maint.Owner.Supplier.cpp
+++ b/jrj/project/business/Supplier/maint.Owner.Supplier.cpp
Binary files differ
diff --git a/jrj/project/business/VATNotify/VATNotifyParse.cpp b/jrj/project/business/VATNotify/VATNotifyParse.cpp
index bad9723..d2e53e2 100644
--- a/jrj/project/business/VATNotify/VATNotifyParse.cpp
+++ b/jrj/project/business/VATNotify/VATNotifyParse.cpp
@@ -111,6 +111,7 @@
int onload()
{
+ SetArg();
dw_base = GetControl(L"dw_base");
dw_base.openUrl(L"/sale/view/VATNotify/template/VATNotify/ParseNumber");
diff --git a/jrj/project/business/VATNotify/maint.papercard.vatnotify.cpp b/jrj/project/business/VATNotify/maint.papercard.vatnotify.cpp
index d4836ac..44a8e72 100644
--- a/jrj/project/business/VATNotify/maint.papercard.vatnotify.cpp
+++ b/jrj/project/business/VATNotify/maint.papercard.vatnotify.cpp
@@ -737,6 +737,7 @@
int onload()
{
+ SetArg();
dw_item = GetControl(L"dw_item");
dw_item.openUrl(L"/sale/view/VATNotify/template/VATNotify/item");
dw_item.SetColumnState(L"CName", false);
diff --git a/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp b/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp
index c137345..781673d 100644
--- a/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp
+++ b/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp
@@ -830,6 +830,7 @@
int onload()
{
+ SetArg();
dw_item = GetControl(L"dw_item");
dw_item.openUrl(L"/sale/view/VATNotify/template/VATNotify/item");
dw_item.SetColumnState(L"InvoiceNo", false);
diff --git a/jrj/project/business/VATNotify/update.vatnotify.cpp b/jrj/project/business/VATNotify/update.vatnotify.cpp
index 9ed58ae..e1083c6 100644
--- a/jrj/project/business/VATNotify/update.vatnotify.cpp
+++ b/jrj/project/business/VATNotify/update.vatnotify.cpp
@@ -343,6 +343,7 @@
int onload()
{
+ SetArg();
dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"/sale/view/VATNotify/template/VATNotify/item");
dw_item = GetControl(L"dw_item");
--
Gitblit v1.9.3