From 66f0b6533137599d69bee08fbc3f6f8865aec75e Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期四, 12 九月 2024 11:23:02 +0800
Subject: [PATCH] update
---
jrj/project/business/BasicCode/SKUItem.categoryselect.cpp | 14 +-
jrj/project/business/Company/HrPersonMaint.cpp | 4
jrj/project/business/Quote3.list3.cpp | 0
jrj/project/business/Quote3.maint.cpp | 0
jrj/project/business/Expense/maint.samplesequest.cpp | 0
jrj/project/business/BasicCode/ProfitParam.cpp | 2
jrj/project/business/BasicCode/TypeList.maint.supplier.cpp | 6
jrj/project/business/PO/maint.Document.PO.v3 .cpp | 0
jrj/project/business/Supplier/maint.Document.SupplierSD.cpp | 0
jrj/project/business/Supplier3.list.cpp | 16 ++--
jrj/project/business/Enquiry/Quick.Input.NewProductEx.cpp | 6
jrj/project/business/Expense/maint.basicfare.cpp | 0
jrj/project/business/PO/PO.maint.base.cpp | 0
jrj/project/viewobject/view.base.hpp | 2
jrj/project/business/Expense/FreightExpenseInput.cpp | 0
jrj/project/business/Expense/Reimbursement.cpp | 0
jrj/project/business/Expense/maint.samplefee.cpp | 0
jrj/project/business/SO/maint.Document.SO3.v3.cpp | 4
jrj/project/business/Customer3.maint.cpp | 36 ++++----
jrj/project/business/Enquiry/Enquiry.maint.cpp | 4
jrj/project/business/Expense/maint.Document.ExportCredit.cpp | 0
jrj/project/business/Expense/SampleFee.cpp | 0
jrj/project/business/GDN3.maint.cpp | 6
jrj/project/business/SO3.maint.cpp | 10 +-
jrj/project/business/Expense/maint.expense.ap.cpp | 0
jrj/project/business/Expense/maint.salaryslip.cpp | 0
jrj/project/business/SO/Product.Select.SO.cpp | 4
jrj/xframe/vbusiness/vutil/publiccode.vutil.vbusiness.hpp | 2
jrj/project/business/Customer/XmShare.Custumer.v3.cpp | 0
jrj/project/business/GDN3.list.cpp | 6
jrj/project/business/Enquiry/Entity.Product.Select.cpp | 4
jrj/project/business/SystemSettings/Developer.Synch.cpp | 2
jrj/project/business/AR/ExchangeBankTran.cpp | 4
jrj/project/business/BasicCode/ColorCardNew.cpp | 4
jrj/project/business/QuoteFile.cpp | 14 +-
jrj/project/business/BasicCode/QuickCode.cpp | 8 +-
jrj/project/business/HR/GraduationSchool.cpp | 2
jrj/project/business/SystemSettings/Data.config.cpp | 4
jrj/project/business/Customer3.list.cpp | 0
jrj/project/business/PO/InsertPO.PO.cpp | 0
jrj/project/business/Quote/Product.Select.cpp | 4
jrj/project/business/Expense/maint.Document.SampleRequestForm.cpp | 0
jrj/project/printview/Template.Print.Dialog.cpp | 2
jrj/project/business/Supplier/maint.Document.SupplierEx.cpp | 0
jrj/project/business/VATNotify/VATInvoiceNew.cpp | 2
jrj/project/business/Supplier/maintex.Owner.Supplier.cpp | 0
jrj/project/business/Company/HrOrgMaint.cpp | 2
jrj/project/business/Expense/SelectSalaryslip.cpp | 0
jrj/project/business/BasicCode/FreightExpenseType.cpp | 2
jrj/project/business/Enquiry.list.cpp | 6
jrj/project/business/BasicCode/SKUTemplate.select.cpp | 4
jrj/project/business/PO/Maint.PaperCard.PO.hpp | 0
jrj/project/business/Expense/APSpliteLine.cpp | 0
jrj/project/business/EnquiryEx3.list.cpp | 0
jrj/project/business/Product.list.cpp | 12 +-
jrj/project/business/Supplier.maint.cpp | 0
jrj/project/business/Expense/maint.Document.MouldFeeBase.cpp | 0
57 files changed, 99 insertions(+), 99 deletions(-)
diff --git a/jrj/project/business/AR/ExchangeBankTran.cpp b/jrj/project/business/AR/ExchangeBankTran.cpp
index a4256f7..29787d2 100644
--- a/jrj/project/business/AR/ExchangeBankTran.cpp
+++ b/jrj/project/business/AR/ExchangeBankTran.cpp
@@ -100,7 +100,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/bank", arg.GetString(), x) != 1)
@@ -121,7 +121,7 @@
xml x;
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
if (getUrl(L"/sale/data/AR/tran/bank", arg.GetString(), x) != 1)
{
trace(x.text());
diff --git a/jrj/project/business/BasicCode/ColorCardNew.cpp b/jrj/project/business/BasicCode/ColorCardNew.cpp
index d867ecd..ce7d68b 100644
--- a/jrj/project/business/BasicCode/ColorCardNew.cpp
+++ b/jrj/project/business/BasicCode/ColorCardNew.cpp
@@ -56,7 +56,7 @@
}*/
xaserverarg arg0 ;
- arg0.setNativePointer(arg0.CreateInstance());
+
//arg0.AddArg(L"Action", action,L"xs:xstring");
arg0.AddArg(L"EntityName", L"ColorCard",L"xs:xstring");
arg0.AddArg(L"EntityIDName", L"ColorCardID",L"xs:xstring");
@@ -235,7 +235,7 @@
xml x;
xaserverarg arg;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"ColorCardID", id);
if(xurl::get(L"ColorCard/pref/beforedelete",arg.GetString(),x)!=1)
{
diff --git a/jrj/project/business/BasicCode/FreightExpenseType.cpp b/jrj/project/business/BasicCode/FreightExpenseType.cpp
index dcb271c..3ec255a 100644
--- a/jrj/project/business/BasicCode/FreightExpenseType.cpp
+++ b/jrj/project/business/BasicCode/FreightExpenseType.cpp
@@ -77,7 +77,7 @@
dw_list.DwUpdateAllToEx(x);
xaserverarg arg;
- arg.setNativePointer(xaserverarg::CreateInstance());
+
arg.AddArg(L"content",x.xml());
//trace(x.xml());
diff --git a/jrj/project/business/BasicCode/ProfitParam.cpp b/jrj/project/business/BasicCode/ProfitParam.cpp
index b91469d..6392233 100644
--- a/jrj/project/business/BasicCode/ProfitParam.cpp
+++ b/jrj/project/business/BasicCode/ProfitParam.cpp
@@ -59,7 +59,7 @@
dw_list.AcceptText();
dw_list.DwUpdateAllToEx(x);
xaserverarg arg;
- arg.setNativePointer(xaserverarg::CreateInstance());
+
arg.AddArg(L"content",x.xml());
if(xurl::get(L"/sale/data/Gdn/update/ProParamUpdate", arg.GetString(),x)!=1)
{
diff --git a/jrj/project/business/BasicCode/QuickCode.cpp b/jrj/project/business/BasicCode/QuickCode.cpp
index bc02e91..8fc01e6 100644
--- a/jrj/project/business/BasicCode/QuickCode.cpp
+++ b/jrj/project/business/BasicCode/QuickCode.cpp
@@ -139,7 +139,7 @@
xml xi;
xaserverarg argi;
- argi.setNativePointer(argi.CreateInstance());
+
if (xurl::get(L"QuickCode/ExchangeRate/import", argi.GetString(), xi) != 1)
{
trace(xi.text());
@@ -479,7 +479,7 @@
xml x1;
xaserverarg arg1;
- arg1.setNativePointer(arg1.CreateInstance());
+
arg1.AddArg(L"id", L"地区");
if (xurl::get(L"/sale/data/QuickCode/entity/list", arg1.GetString(), x1) != 1)
{
@@ -514,7 +514,7 @@
xml x2;
xaserverarg arg2;
- arg2.setNativePointer(arg2.CreateInstance());
+
arg2.AddArg(L"id", L"FND_Currency");
if (xurl::get(L"/sale/data/QuickCode/entity/list", arg2.GetString(), x2) != 1)
{
@@ -549,7 +549,7 @@
xml x3;
xaserverarg arg3;
- arg3.setNativePointer(arg3.CreateInstance());
+
arg3.AddArg(L"id", L"FND_Country");
if (xurl::get(L"/sale/data/QuickCode/entity/list", arg3.GetString(), x3) != 1)
{
diff --git a/jrj/project/business/BasicCode/SKUItem.categoryselect.cpp b/jrj/project/business/BasicCode/SKUItem.categoryselect.cpp
index 8246a91..22d6e39 100644
--- a/jrj/project/business/BasicCode/SKUItem.categoryselect.cpp
+++ b/jrj/project/business/BasicCode/SKUItem.categoryselect.cpp
@@ -94,8 +94,8 @@
int OnCmdDispatch0(xstring comdid)
{
- xaserverarg arg = new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg;
+
arg = win::GetParam();
arg.AddArg(L"comdid",comdid);
int xitem = treeview::GetSelectedItem(tv_gs.GetId());
@@ -144,10 +144,10 @@
//alert(xstring(citem));
if (citem==0){//树视图有子节点
- xml x=new xml;
- x.setNativePointer(xml::CreateInstance());
- xaserverarg arg=new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xml x;
+
+ xaserverarg arg;
+
arg.AddArg(L"parentID",pid);
//if(xaserver::ExecXQuery(GetServerUrl(),L"[ItemCategoryEx.xq]",arg.GetString(),x)!=1)
if(url::get(GetEntityName(1)+L"/entity/category",arg.GetString(),x)!=1)
@@ -180,7 +180,7 @@
int CreateRootTree(){
xstring rootid=L"00000000-0000-0000-0000-000000000000";
xml x=new xml;
- x.setNativePointer(xml::CreateInstance());
+
x.LoadXml(L"<Category HasChild='1'><CategoryID>"+rootid+L"</CategoryID></Category>");
int hroot=treeview::InsertItem(tv_gs.GetId(),L"公司产品类别", x.GetXmlDoc().documentElement, 17);
CreateSubTree(hroot);
diff --git a/jrj/project/business/BasicCode/SKUTemplate.select.cpp b/jrj/project/business/BasicCode/SKUTemplate.select.cpp
index 655b852..383fed1 100644
--- a/jrj/project/business/BasicCode/SKUTemplate.select.cpp
+++ b/jrj/project/business/BasicCode/SKUTemplate.select.cpp
@@ -101,8 +101,8 @@
if (GetParam())
{
int iArgs = GetParam();
- xaserverarg arg1 = new xaserverarg;
- arg1.setNativePointer(iArgs);
+ xaserverarg arg1;
+
dw_other = new xdwtable;
dw_other.setNativePointer(arg1.GetArgString(L"dw_other").toInt());
dw_prop = new xdwtable;
diff --git a/jrj/project/business/BasicCode/TypeList.maint.supplier.cpp b/jrj/project/business/BasicCode/TypeList.maint.supplier.cpp
index 2bae2d5..a28d9bf 100644
--- a/jrj/project/business/BasicCode/TypeList.maint.supplier.cpp
+++ b/jrj/project/business/BasicCode/TypeList.maint.supplier.cpp
@@ -148,9 +148,9 @@
int OnRetrieve()
{
xml x ;
- x.setNativePointer(xml::CreateInstance());
- xaserverarg arg = new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+
+ xaserverarg arg;
+
arg.AddArg(L"xxx",L"xxx");
if (getUrl(L"",arg.GetString(),x)!=1)
{
diff --git a/jrj/project/business/Company/HrOrgMaint.cpp b/jrj/project/business/Company/HrOrgMaint.cpp
index be0677a..467694a 100644
--- a/jrj/project/business/Company/HrOrgMaint.cpp
+++ b/jrj/project/business/Company/HrOrgMaint.cpp
@@ -94,7 +94,7 @@
//trace(val);
//return 1;
xaserverarg args;
- args.setNativePointer(args.CreateInstance());
+
args.AddArg(L"content", val);
//trace(val);
xml x1;
diff --git a/jrj/project/business/Company/HrPersonMaint.cpp b/jrj/project/business/Company/HrPersonMaint.cpp
index f1fccf2..6a7a749 100644
--- a/jrj/project/business/Company/HrPersonMaint.cpp
+++ b/jrj/project/business/Company/HrPersonMaint.cpp
@@ -196,7 +196,7 @@
xml xs;
xaserverarg args;
- args.setNativePointer(args.CreateInstance());
+
args.AddArg(L"Name", Name);
if (xurl::get(L"/sale/data/ManpowerFile/GetUserName", args.GetString(), xs) != 1)
{
@@ -359,7 +359,7 @@
val = xdoc.xml ;
xml xx ;
- xx.setNativePointer(xx.CreateInstance());
+
xx.loadXML(val);
KXMLDOMElement e;
e = xx.selectSingleNode(L"HrPerson");
diff --git a/jrj/project/business/Customer/XmShare.Custumer.v3.cpp b/jrj/project/business/Customer/XmShare.Custumer.v3.cpp
index 2c9826e..c3555f8 100644
--- a/jrj/project/business/Customer/XmShare.Custumer.v3.cpp
+++ b/jrj/project/business/Customer/XmShare.Custumer.v3.cpp
Binary files differ
diff --git a/jrj/project/business/Customer3.list.cpp b/jrj/project/business/Customer3.list.cpp
index 31572ec..7beef39 100644
--- a/jrj/project/business/Customer3.list.cpp
+++ b/jrj/project/business/Customer3.list.cpp
Binary files differ
diff --git a/jrj/project/business/Customer3.maint.cpp b/jrj/project/business/Customer3.maint.cpp
index 4ec034b..7ce8787 100644
--- a/jrj/project/business/Customer3.maint.cpp
+++ b/jrj/project/business/Customer3.maint.cpp
@@ -171,7 +171,7 @@
if (colname == L"CountryCode")
{
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"countryCode",coldata);
xml x;
@@ -671,10 +671,10 @@
int CustomerModify()//跳到客户修改界面
{
//trace(L"asdsad");
- xaserverarg& arg = *new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg;
+
arg.AddArg(L"EntityID", maint::m_EntityID);
- openUrl(L"/sale/view/"+GetEntityName(1)+L"/worknode/customermodify/open", &arg);
+ openUrl(L"/sale/view/"+GetEntityName(1)+L"/worknode/customermodify/open", arg);
//CloseWindow();
return 1;
}
@@ -687,26 +687,26 @@
int OnShare()
{
- xaserverarg& arg = *new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg;
+
int row = dw_detail.GetRow();
if(row < 1) return 0;
xstring PartyID = dw_detail.GetItemString(row,L"PartyID");
arg.AddArg(L"EntityID",PartyID);
arg.AddArg(L"EntityName", L"客户共享");
- OpenWindow(L"dev:xpage[UserGroupShare.vx]", (LPARAM) & arg);
+ OpenWindow(L"dev:xpage[UserGroupShare.vx]", arg);
return 1;
}
int OnShareMessage()
{
- xaserverarg& arg = *new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg;
+
int row = dw_detail.GetRow();
if(row < 1) return 0;
xstring PartyID = dw_detail.GetItemString(row,L"PartyID");
arg.AddArg(L"PartyID",PartyID);
- OpenWindow(L"dev:xpage[XmShare.Custumer.v3.vx]", (LPARAM)&arg);
+ OpenWindow(L"dev:xpage[XmShare.Custumer.v3.vx]", arg);
return 1;
}
@@ -792,8 +792,8 @@
{
xsheet.DeleteSheet(1);
xstring xp = L"<xframe src='dev:xpage[CustomerGoodsVd.vx]' />";
- xaserverarg& arg = * new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg;
+
arg.AddArg(L"CustomerID",m_EntityID);
arg.AddArg(L"FROM", L"Customer");
arg.AddArg(L"CustomerName", dw_detail.GetItemString(1,L"Name"));
@@ -923,8 +923,8 @@
xstring value = hdr->data;
int row = hdr->row;
//alert(value);
- xaserverarg& arg=*new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg;
+
if(value == L"上传")
{
@@ -936,7 +936,7 @@
arg.AddArg(L"entityid",dw.GetGuid(dw.GetRow()));
- OpenWindow(L"dev:xpage[maint.Document.Customer.v3.vx]", (LPARAM)&arg);
+ OpenWindow(L"dev:xpage[maint.Document.Customer.v3.vx]", arg);
return 1;
}
return 1;
@@ -1085,7 +1085,7 @@
{
xml x;
xaserverarg arg;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"EntityID", ID);
if (getUrl(L"/sale/data/CustomerV3/entity/maint", arg.GetString(), x) != 1)
@@ -1225,8 +1225,8 @@
{
xsheet.DeleteSheet(0);
xstring xp = L"<xframe src='dev:xpage[CustomerGoodsVd.vx]' />";
- xaserverarg& arg = *new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg ;
+
arg.AddArg(L"CustomerID", m_EntityID);
arg.AddArg(L"FROM", L"Customer");
arg.AddArg(L"CustomerName", dw_detail.GetItemString(1,L"Name"));
diff --git a/jrj/project/business/Enquiry.list.cpp b/jrj/project/business/Enquiry.list.cpp
index dc72830..96fc311 100644
--- a/jrj/project/business/Enquiry.list.cpp
+++ b/jrj/project/business/Enquiry.list.cpp
@@ -76,8 +76,8 @@
xml x ;
- xaserverarg& arg = *new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg;
+
arg.AddArg(L"scene",scene,L"xs:xstring");
arg.AddArg(L"EntityID",EntityID,L"xs:xstring");
arg.AddArg(L"EntityName",GetEntityName(1),L"xs:xstring");
@@ -359,7 +359,7 @@
xml x ;
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
dw_pricelistex.DwUpdateAllToEx(x);
if(x.xml()!=L"")
diff --git a/jrj/project/business/Enquiry/Enquiry.maint.cpp b/jrj/project/business/Enquiry/Enquiry.maint.cpp
index 0ddb9cc..ba43fb2 100644
--- a/jrj/project/business/Enquiry/Enquiry.maint.cpp
+++ b/jrj/project/business/Enquiry/Enquiry.maint.cpp
@@ -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";
@@ -1160,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"));
diff --git a/jrj/project/business/Enquiry/Entity.Product.Select.cpp b/jrj/project/business/Enquiry/Entity.Product.Select.cpp
index cace6fe..4e3cacf 100644
--- a/jrj/project/business/Enquiry/Entity.Product.Select.cpp
+++ b/jrj/project/business/Enquiry/Entity.Product.Select.cpp
@@ -114,7 +114,7 @@
xml xp ;
xaserverarg arg_pic;
- arg_pic.setNativePointer(arg_pic.CreateInstance());
+
arg_pic.AddArg(L"SKUID", skuid);
if (xurl::get(L"/sale/data/ProductLibrary3/pref/picture/imagelistSKU", arg_pic.GetString(), xp) != 1)
{
@@ -151,7 +151,7 @@
xml xp ;
xaserverarg arg_pic;
- arg_pic.setNativePointer(arg_pic.CreateInstance());
+
arg_pic.AddArg(L"SKUID", skuid);
arg_pic.AddArg(L"CustomerID", m_customer);
arg_pic.AddArg(L"CustomerItemNo", customerItemNo);
diff --git a/jrj/project/business/Enquiry/Quick.Input.NewProductEx.cpp b/jrj/project/business/Enquiry/Quick.Input.NewProductEx.cpp
index 54afd28..479dca9 100644
--- a/jrj/project/business/Enquiry/Quick.Input.NewProductEx.cpp
+++ b/jrj/project/business/Enquiry/Quick.Input.NewProductEx.cpp
@@ -59,7 +59,7 @@
xml x ;
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"no",sno);
if(xurl::get(L"/sale/data/SO/goods/goodslib/ChildFolderList", arg.GetString(),x)!=1)
{
@@ -111,7 +111,7 @@
xml x;
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"count", L"1" );
arg.AddArg(L"type", typ );
if(xurl::get(L"/sale/data/SO/goods/usegoods/goodslib/asknos", arg.GetString(),x)!=1)return L"";
@@ -169,7 +169,7 @@
dw_list.AcceptText();
dw_list.DwUpdateAllToEx(x);
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"content",x.xml());
if(xurl::get(L"/sale/data/ProductLibrary3/update/newestproduct", arg.GetString(),x)!=1)
{
diff --git a/jrj/project/business/EnquiryEx3.list.cpp b/jrj/project/business/EnquiryEx3.list.cpp
index e86cc86..4a04399 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/APSpliteLine.cpp b/jrj/project/business/Expense/APSpliteLine.cpp
index 1cbd912..6f96a74 100644
--- a/jrj/project/business/Expense/APSpliteLine.cpp
+++ b/jrj/project/business/Expense/APSpliteLine.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/FreightExpenseInput.cpp b/jrj/project/business/Expense/FreightExpenseInput.cpp
index 54c0f43..c6f77cc 100644
--- a/jrj/project/business/Expense/FreightExpenseInput.cpp
+++ b/jrj/project/business/Expense/FreightExpenseInput.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/Reimbursement.cpp b/jrj/project/business/Expense/Reimbursement.cpp
index b60710f..c181816 100644
--- a/jrj/project/business/Expense/Reimbursement.cpp
+++ b/jrj/project/business/Expense/Reimbursement.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/SampleFee.cpp b/jrj/project/business/Expense/SampleFee.cpp
index ffeee54..d2d9efe 100644
--- a/jrj/project/business/Expense/SampleFee.cpp
+++ b/jrj/project/business/Expense/SampleFee.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/SelectSalaryslip.cpp b/jrj/project/business/Expense/SelectSalaryslip.cpp
index 1d9cf41..991a502 100644
--- a/jrj/project/business/Expense/SelectSalaryslip.cpp
+++ b/jrj/project/business/Expense/SelectSalaryslip.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/maint.Document.ExportCredit.cpp b/jrj/project/business/Expense/maint.Document.ExportCredit.cpp
index 0fb25c4..022d9d6 100644
--- a/jrj/project/business/Expense/maint.Document.ExportCredit.cpp
+++ b/jrj/project/business/Expense/maint.Document.ExportCredit.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/maint.Document.MouldFeeBase.cpp b/jrj/project/business/Expense/maint.Document.MouldFeeBase.cpp
index 5b924eb..249cb19 100644
--- a/jrj/project/business/Expense/maint.Document.MouldFeeBase.cpp
+++ b/jrj/project/business/Expense/maint.Document.MouldFeeBase.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/maint.Document.SampleRequestForm.cpp b/jrj/project/business/Expense/maint.Document.SampleRequestForm.cpp
index 8cda51d..033d060 100644
--- a/jrj/project/business/Expense/maint.Document.SampleRequestForm.cpp
+++ b/jrj/project/business/Expense/maint.Document.SampleRequestForm.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/maint.basicfare.cpp b/jrj/project/business/Expense/maint.basicfare.cpp
index 3354131..e7599d3 100644
--- a/jrj/project/business/Expense/maint.basicfare.cpp
+++ b/jrj/project/business/Expense/maint.basicfare.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/maint.expense.ap.cpp b/jrj/project/business/Expense/maint.expense.ap.cpp
index 3e1d2ee..cc4ee62 100644
--- a/jrj/project/business/Expense/maint.expense.ap.cpp
+++ b/jrj/project/business/Expense/maint.expense.ap.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/maint.salaryslip.cpp b/jrj/project/business/Expense/maint.salaryslip.cpp
index cf3eb47..7bd336e 100644
--- a/jrj/project/business/Expense/maint.salaryslip.cpp
+++ b/jrj/project/business/Expense/maint.salaryslip.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/maint.samplefee.cpp b/jrj/project/business/Expense/maint.samplefee.cpp
index 1ccbda8..e80094d 100644
--- a/jrj/project/business/Expense/maint.samplefee.cpp
+++ b/jrj/project/business/Expense/maint.samplefee.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/maint.samplesequest.cpp b/jrj/project/business/Expense/maint.samplesequest.cpp
index 30d2d1c..b44a836 100644
--- a/jrj/project/business/Expense/maint.samplesequest.cpp
+++ b/jrj/project/business/Expense/maint.samplesequest.cpp
Binary files differ
diff --git a/jrj/project/business/GDN3.list.cpp b/jrj/project/business/GDN3.list.cpp
index cffb2b8..6f6e3dc 100644
--- a/jrj/project/business/GDN3.list.cpp
+++ b/jrj/project/business/GDN3.list.cpp
@@ -491,11 +491,11 @@
return 0;
}*/
- xaserverarg& arg = *new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg ;
+
trace(EntityID);
arg.AddArg(L"GDNID", EntityID);
- OpenWindow(L"dev:xpage[GDNDelay.vx]", (LPARAM)&arg);
+ OpenWindow(L"dev:xpage[GDNDelay.vx]", arg);
}
else if (comdid == L"action:bill.SourceRemark") return OnSourceRemark();
diff --git a/jrj/project/business/GDN3.maint.cpp b/jrj/project/business/GDN3.maint.cpp
index a9d306d..658f52c 100644
--- a/jrj/project/business/GDN3.maint.cpp
+++ b/jrj/project/business/GDN3.maint.cpp
@@ -55,8 +55,8 @@
xml x;
- xaserverarg& arg = *new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg ;
+
arg.AddArg(L"scene", scene, L"xs:xstring");
arg.AddArg(L"EntityID", EntityID, L"xs:xstring");
arg.AddArg(L"EntityName", EntityName, L"xs:xstring");
@@ -1902,7 +1902,7 @@
CheckCDLine();
CheckGW();
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"EntityName", L"GDN3", L"");
arg.AddArg(L"EntityID", InvoiceID, L"");
arg.AddArg(L"EntityNo", dw_base.GetItemString(1, L"InvoiceNo"), L"");
diff --git a/jrj/project/business/HR/GraduationSchool.cpp b/jrj/project/business/HR/GraduationSchool.cpp
index ec34e40..dcddfcc 100644
--- a/jrj/project/business/HR/GraduationSchool.cpp
+++ b/jrj/project/business/HR/GraduationSchool.cpp
@@ -80,7 +80,7 @@
xml x ;
xaserverarg arg;//放置参数
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"gsid", gsid);
if (getUrl(L"/sale/data/GraduationSchool/data/delete", arg.GetString(), x) != 1)
{
diff --git a/jrj/project/business/PO/InsertPO.PO.cpp b/jrj/project/business/PO/InsertPO.PO.cpp
index 1018358..fd0c091 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.hpp b/jrj/project/business/PO/Maint.PaperCard.PO.hpp
index ae7fe7b..8f4bed1 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/PO.maint.base.cpp b/jrj/project/business/PO/PO.maint.base.cpp
index bf6bcda..ffac936 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/maint.Document.PO.v3 .cpp b/jrj/project/business/PO/maint.Document.PO.v3 .cpp
index effed8a..da75c0b 100644
--- a/jrj/project/business/PO/maint.Document.PO.v3 .cpp
+++ b/jrj/project/business/PO/maint.Document.PO.v3 .cpp
Binary files differ
diff --git a/jrj/project/business/Product.list.cpp b/jrj/project/business/Product.list.cpp
index ca9b3d6..183d0aa 100644
--- a/jrj/project/business/Product.list.cpp
+++ b/jrj/project/business/Product.list.cpp
@@ -652,7 +652,7 @@
xml x ;
xaserverarg arg;
- arg.setNativePointer(arg.CreateInstance());
+
xstring str = L"<Item update.modify='1' update.delete='1' guid='" + id + L"'/>";
arg.AddArg(L"content", str);
if (xurl::get(L"/sale/data/ProductLibrary/image/update", arg.GetString(), x) != 1)
@@ -792,7 +792,7 @@
xstring guid = e.getAttribute(L"guid");
if (guid == L"") return 1;
xaserverarg arg;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"guid", e.getAttribute(L"guid"));
if (name == L"个人产品")
arg.AddArg(L"FolderID", e.getAttribute(L"guid"));
@@ -925,9 +925,9 @@
}
content += L"</data>";
xaserverarg carg;
- carg.setNativePointer(carg.CreateInstance());
+
carg.AddArg(L"content", content);
- OpenWindow(L"dev:xpage[SO.Simulation.Import.vx]", (LPARAM) & carg);
+ OpenWindow(L"dev:xpage[SO.Simulation.Import.vx]", carg);
return 1;
}
else if (comdid == L"xmEnquiry")
@@ -942,9 +942,9 @@
}
content += L"</data>";
xaserverarg carg;
- carg.setNativePointer(carg.CreateInstance());
+
carg.AddArg(L"content", content);
- OpenWindow(L"dev:xpage[Enquiry.Import.vx]", (LPARAM)&carg);
+ OpenWindow(L"dev:xpage[Enquiry.Import.vx]", carg);
return 1;
}
else if (comdid == L"xmPurchar")
diff --git a/jrj/project/business/Quote/Product.Select.cpp b/jrj/project/business/Quote/Product.Select.cpp
index de5d033..f4d4a79 100644
--- a/jrj/project/business/Quote/Product.Select.cpp
+++ b/jrj/project/business/Quote/Product.Select.cpp
@@ -111,7 +111,7 @@
xml xp;
xaserverarg arg_pic;
- arg_pic.setNativePointer(arg_pic.CreateInstance());
+
arg_pic.AddArg(L"SKUID",skuid);
if(xurl::get(L"/sale/data/ProductLibrary3/pref/picture/imagelistSKU",arg_pic.GetString(),xp)!=1)
{
@@ -146,7 +146,7 @@
xml xp;
xaserverarg arg_pic;
- arg_pic.setNativePointer(arg_pic.CreateInstance());
+
arg_pic.AddArg(L"SKUID",skuid);
arg_pic.AddArg(L"CustomerID",m_customer);
arg_pic.AddArg(L"CustomerItemNo",customerItemNo);
diff --git a/jrj/project/business/Quote3.list3.cpp b/jrj/project/business/Quote3.list3.cpp
index d0c1c5a..991587b 100644
--- a/jrj/project/business/Quote3.list3.cpp
+++ b/jrj/project/business/Quote3.list3.cpp
Binary files differ
diff --git a/jrj/project/business/Quote3.maint.cpp b/jrj/project/business/Quote3.maint.cpp
index 2840619..82af445 100644
--- a/jrj/project/business/Quote3.maint.cpp
+++ b/jrj/project/business/Quote3.maint.cpp
Binary files differ
diff --git a/jrj/project/business/QuoteFile.cpp b/jrj/project/business/QuoteFile.cpp
index 55ff4f5..cabdba0 100644
--- a/jrj/project/business/QuoteFile.cpp
+++ b/jrj/project/business/QuoteFile.cpp
@@ -1327,7 +1327,7 @@
xstring items = GetPurchedItems();
xaserverarg arg4 ;
- arg4.setNativePointer(xaserverarg::CreateInstance());
+
trace(items);
arg4.AddArg(L"value", items);
OpenWindow(L"dev:xpage[QuoteFilePurched.vx]", arg4);
@@ -1533,7 +1533,7 @@
xstring items = GetPurchItems();
xaserverarg arg4 ;
- arg4.setNativePointer(xaserverarg::CreateInstance());
+
trace(items);
arg4.AddArg(L"value", items);
OpenWindow(L"dev:xpage[QuoteFilePurch.vx]", arg4);
@@ -2027,7 +2027,7 @@
xstring items = GetPurchItems();
xaserverarg arg4 ;
- arg4.setNativePointer(xaserverarg::CreateInstance());
+
trace(items);
arg4.AddArg(L"value", items);
OpenWindow(L"dev:xpage[QuoteFilePurch.vx]", arg4);
@@ -2868,7 +2868,7 @@
if (dw_cell.GetItemString(row, colItemNo) != L"")
{
xaserverarg argx ;
- argx.setNativePointer(argx.CreateInstance());
+
argx.AddArg(L"GoodsNo", dw_cell.GetItemString(row, colItemNo));
OpenWindow(L"dev:xpage[CustomerItemNoList.vx]", argx);
if (argx.GetArgString(L"action") != L"ok") return 1;
@@ -3252,7 +3252,7 @@
{
xml xp ;
xaserverarg arg_pic ;
- arg_pic.setNativePointer(arg_pic.CreateInstance());
+
arg_pic.AddArg(L"SKUNo", goodsno);
ximageview im = GetControl(L"frame:im1");
@@ -3311,7 +3311,7 @@
{
xml xp ;
xaserverarg arg_pic ;
- arg_pic.setNativePointer(arg_pic.CreateInstance());
+
arg_pic.AddArg(L"GoodsNo", goodsno);
ximageview im = GetControl(L"frame:im1");
@@ -4320,7 +4320,7 @@
if (dw_cell.GetItemString(ARow, colItemNo) != L"")
{
xaserverarg argx ;
- argx.setNativePointer(argx.CreateInstance());
+
argx.AddArg(L"GoodsNo", dw_cell.GetItemString(ARow, colItemNo));
OpenWindow(L"dev:xpage[CustomerItemNoList.vx]", argx);
if (argx.GetArgString(L"action") != L"ok")
diff --git a/jrj/project/business/SO/Product.Select.SO.cpp b/jrj/project/business/SO/Product.Select.SO.cpp
index 0f83c4e..d6a5f11 100644
--- a/jrj/project/business/SO/Product.Select.SO.cpp
+++ b/jrj/project/business/SO/Product.Select.SO.cpp
@@ -160,7 +160,7 @@
{
xml x;
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"guid", guid);
if (xurl::get(L"/sale/data/SO/goods/goodsprop/list", arg.GetString(), x) != 1)
{
@@ -570,7 +570,7 @@
xstring guid = e.getAttribute(L"guid");
if (guid == L"") return 1;
xaserverarg arg;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"guid", e.getAttribute(L"guid"));
arg.AddArg(L"No", e.getAttribute(L"CategoryNo"));
arg.AddArg(L"CName", e.getAttribute(L"CName"));
diff --git a/jrj/project/business/SO/maint.Document.SO3.v3.cpp b/jrj/project/business/SO/maint.Document.SO3.v3.cpp
index 4e1046e..d6d8f1a 100644
--- a/jrj/project/business/SO/maint.Document.SO3.v3.cpp
+++ b/jrj/project/business/SO/maint.Document.SO3.v3.cpp
@@ -181,7 +181,7 @@
xml x;
xaserverarg args ;
- args.setNativePointer(args.CreateInstance());
+
args.AddArg(L"myurl", myurl);
args.AddArg(L"name", ret);
args.AddArg(L"filepath", sname);
@@ -297,7 +297,7 @@
return 0;
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"filepath", file);
xml x ;
if (xurl::get(L"/sale/data/TDocument3/file/delete", arg.GetString(), x) != 1)
diff --git a/jrj/project/business/SO3.maint.cpp b/jrj/project/business/SO3.maint.cpp
index 3132a61..8704028 100644
--- a/jrj/project/business/SO3.maint.cpp
+++ b/jrj/project/business/SO3.maint.cpp
@@ -724,12 +724,12 @@
alert(L"请先保存数据!");
return 1;
}
- xaserverarg& arg = * new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg;
+
arg.AddArg(L"EntityName", L"SaleOrder", L"");
arg.AddArg(L"EntityID", dw_base.GetItemString(1, L"SOID"), L"");
arg.AddArg(L"EntityNo", dw_base.GetItemString(1, L"SONo"), L"");
- openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
+ openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", arg);
return 1;
}
else if (comdid == L"xmSaveEx" && bupdate)
@@ -885,8 +885,8 @@
ximageview im = GetControl(L"im1");
KXMLDOMDocument xp;
- xaserverarg& arg_pic = *new xaserverarg;
- arg_pic.setNativePointer(arg_pic.CreateInstance());
+ xaserverarg arg_pic ;
+
arg_pic.AddArg(L"SKUNo", skuno);
xstring res = L"/sale/data/ProductLibrary3/pref/picture/imagelistSKUNo";
diff --git a/jrj/project/business/Supplier.maint.cpp b/jrj/project/business/Supplier.maint.cpp
index cfc05c3..31f581c 100644
--- a/jrj/project/business/Supplier.maint.cpp
+++ b/jrj/project/business/Supplier.maint.cpp
Binary files differ
diff --git a/jrj/project/business/Supplier/maint.Document.SupplierEx.cpp b/jrj/project/business/Supplier/maint.Document.SupplierEx.cpp
index 9828da7..af954b7 100644
--- a/jrj/project/business/Supplier/maint.Document.SupplierEx.cpp
+++ b/jrj/project/business/Supplier/maint.Document.SupplierEx.cpp
Binary files differ
diff --git a/jrj/project/business/Supplier/maint.Document.SupplierSD.cpp b/jrj/project/business/Supplier/maint.Document.SupplierSD.cpp
index 311f6ac..62a18fb 100644
--- a/jrj/project/business/Supplier/maint.Document.SupplierSD.cpp
+++ b/jrj/project/business/Supplier/maint.Document.SupplierSD.cpp
Binary files differ
diff --git a/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp b/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp
index 25411ee..023a8fc 100644
--- a/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp
+++ b/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp
Binary files differ
diff --git a/jrj/project/business/Supplier3.list.cpp b/jrj/project/business/Supplier3.list.cpp
index 47dda23..fc5f033 100644
--- a/jrj/project/business/Supplier3.list.cpp
+++ b/jrj/project/business/Supplier3.list.cpp
@@ -244,7 +244,7 @@
xml x;
xaserverarg arg;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"guid", sguid);
arg.AddArg(L"EntityID", sguid);
// trace(sguid);
@@ -280,7 +280,7 @@
xml x;
xaserverarg arg;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"EntityID", entity);
@@ -413,23 +413,23 @@
}
if (comdid == L"action:bill.Annex")
{
- xaserverarg& arg = *new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg ;
+
arg.AddArg(L"entityid", dw_list.GetItemString(dw_list.GetRow(), L"SupplierID"));
arg.AddArg(L"ApplyStatus", dw_list.GetItemString(dw_list.GetRow(), L"ApplyStatus"));
- OpenWindow(L"dev:xpage[maint.Document.Supplier.v3.vx]", (LPARAM)&arg);
+ OpenWindow(L"dev:xpage[maint.Document.Supplier.v3.vx]", arg);
return 1;
}
if (comdid == L"action:bill.AnnexEx")
{
- xaserverarg& arg4 = *new xaserverarg;
- arg4.setNativePointer(arg4.CreateInstance());
+ xaserverarg arg4;
+
arg4.AddArg(L"entityid", dw_list.GetItemString(dw_list.GetRow(), L"SupplierID"));
//arg4.AddArg(L"ApplyStatus",dw_list.GetItemString(dw_list.GetRow(),L"ApplyStatus"));
//OpenWindow(L"dev:xpage[maint.Document.Customer.v3.vx]", p4);
- OpenWindow(L"dev:xpage[maint.Document.SupplierSD.v3.vx]", (LPARAM)&arg4);
+ OpenWindow(L"dev:xpage[maint.Document.SupplierSD.v3.vx]", arg4);
return 1;
}
if (comdid == L"action:bill.checked")
diff --git a/jrj/project/business/SystemSettings/Data.config.cpp b/jrj/project/business/SystemSettings/Data.config.cpp
index 0af5433..5bda1df 100644
--- a/jrj/project/business/SystemSettings/Data.config.cpp
+++ b/jrj/project/business/SystemSettings/Data.config.cpp
@@ -65,7 +65,7 @@
xml x;
xaserverarg arg;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"pid", id);
arg.AddArg(L"tree", xid);
//if(xaserver::ExecXQuery(GetServerUrl(),L"[selectRoleInt.xq]",arg.GetString(),x)!=1)
@@ -87,7 +87,7 @@
xml x;
xaserverarg arg;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"id", id);
trace(id);
arg.AddArg(L"flag", L"-1");
diff --git a/jrj/project/business/SystemSettings/Developer.Synch.cpp b/jrj/project/business/SystemSettings/Developer.Synch.cpp
index f9189cc..7f504f8 100644
--- a/jrj/project/business/SystemSettings/Developer.Synch.cpp
+++ b/jrj/project/business/SystemSettings/Developer.Synch.cpp
@@ -399,7 +399,7 @@
int OnSetTree(int hItem, xstring src)
{
- xml x=new xml;
+ xml x;
xaserverarg arg;
;
diff --git a/jrj/project/business/VATNotify/VATInvoiceNew.cpp b/jrj/project/business/VATNotify/VATInvoiceNew.cpp
index 5ccdc96..8ad5141 100644
--- a/jrj/project/business/VATNotify/VATInvoiceNew.cpp
+++ b/jrj/project/business/VATNotify/VATInvoiceNew.cpp
@@ -205,7 +205,7 @@
xaserverarg arg;
dw_1.DwUpdateAllToEx(x);
- xml x0 = new xml;
+ xml x0;
x0.loadXML(L"<data/>");
diff --git a/jrj/project/printview/Template.Print.Dialog.cpp b/jrj/project/printview/Template.Print.Dialog.cpp
index 51aa67d..00d45e7 100644
--- a/jrj/project/printview/Template.Print.Dialog.cpp
+++ b/jrj/project/printview/Template.Print.Dialog.cpp
@@ -491,7 +491,7 @@
}
else
{
- arg_param.setNativePointer(arg_param.CreateInstance());
+
m_EntityName = L"SO";
m_EntityID = L"00000000-0000-0000-0000-000000000000";
}
diff --git a/jrj/project/viewobject/view.base.hpp b/jrj/project/viewobject/view.base.hpp
index 3a919ec..e26aa9a 100644
--- a/jrj/project/viewobject/view.base.hpp
+++ b/jrj/project/viewobject/view.base.hpp
@@ -292,7 +292,7 @@
{
KXMLDOMDocument x;
xaserverarg arg;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"EntityNo", EntityNo);
arg.AddArg(L"EntityID", EntityID);
arg.AddArg(L"Subject", Subject);
diff --git a/jrj/xframe/vbusiness/vutil/publiccode.vutil.vbusiness.hpp b/jrj/xframe/vbusiness/vutil/publiccode.vutil.vbusiness.hpp
index 7e44695..5d151dd 100644
--- a/jrj/xframe/vbusiness/vutil/publiccode.vutil.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vutil/publiccode.vutil.vbusiness.hpp
@@ -239,7 +239,7 @@
//xml
//x.setNativePointer(xml::CreateInstance());
xaserverarg arg;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"AssignmentID", sguid);
if (xaserver::ExecXQuery(L"", L"[getAssignment.xq]", arg.GetString(), x) == 1)
{
--
Gitblit v1.9.3