From c29c4c815cca07876421f764f4b9a5f6f86068f2 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 30 八月 2024 11:41:05 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/AR/ExchageInput3.cpp | 4 -
jrj/project/business/Company/CompanyMaint.cpp | 5 --
jrj/project/business/Expense/VATNotityListShiftToList.cpp | 0
jrj/project/business/SO/Product.FetchNo.cpp | 2 -
jrj/project/business/Company/HrPersonMaint.cpp | 2
jrj/project/business/Company/HrOrgType.cpp | 1
jrj/project/business/VATNotify/VATInvoiceNew.cpp | 18 ++------
jrj/project/business/AR/ExchangeColumnTran.cpp | 6 --
jrj/project/business/Company/HrJob.cpp | 2 -
jrj/project/business/VATNotify/VATNotifyParse.cpp | 1
jrj/project/business/VATNotify/update.vatnotify.cpp | 6 +--
jrj/project/business/Supplier/maint.Owner.Supplier.cpp | 0
jrj/project/business/SO/select.item.so.cpp | 2 -
jrj/project/business/AR/ExchangeSignFast.cpp | 2 -
jrj/project/business/AP/maint.ap.cpp | 2
jrj/project/business/Company/CompanyList.cpp | 2 -
jrj/project/business/Supplier/Inspection.Supplie.cpp | 0
jrj/project/business/Supplier.maint.cpp | 0
jrj/project/business/Customer3.maint.cpp | 5 +-
jrj/project/business/Company/HrEmployeeAdd.cpp | 2 -
jrj/project/business/Expense/VATInvoiceAdd.cpp | 0
jrj/project/business/PO/InsertPO.PO.cpp | 0
22 files changed, 14 insertions(+), 48 deletions(-)
diff --git a/jrj/project/business/AP/maint.ap.cpp b/jrj/project/business/AP/maint.ap.cpp
index ff6ba9e..ef6c275 100644
--- a/jrj/project/business/AP/maint.ap.cpp
+++ b/jrj/project/business/AP/maint.ap.cpp
@@ -102,7 +102,7 @@
xaserverarg arg;
arg.AddArg(L"content", x.xml());
-
+ alert(x.xml());
if (xurl::get(L"/sale/data/AP/update", arg.GetString(), x) != 1)
{
xstring error = x.text();
diff --git a/jrj/project/business/AR/ExchageInput3.cpp b/jrj/project/business/AR/ExchageInput3.cpp
index ab505d1..3063bc9 100644
--- a/jrj/project/business/AR/ExchageInput3.cpp
+++ b/jrj/project/business/AR/ExchageInput3.cpp
@@ -61,7 +61,7 @@
arg.AddArg(L"content", x.xml());
- //trace(x.xml());
+ alert(x.xml());
if (xurl::get(L"/sale/data/AR/update/item", arg.GetString(), x) != 1)
{
xstring error = x.text();
@@ -453,7 +453,6 @@
dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"/sale/view/AR/template/list");
-
dw_signed = GetControl(L"dw_signed");
dw_signed.openUrl(L"/sale/view/AR/template/listFinish");
dw_exch = GetControl(L"dw_exch");
@@ -490,7 +489,6 @@
int onloaded()
{
SetAgent();
-
return 1;
}
};
diff --git a/jrj/project/business/AR/ExchangeColumnTran.cpp b/jrj/project/business/AR/ExchangeColumnTran.cpp
index f3a4c21..2905d89 100644
--- a/jrj/project/business/AR/ExchangeColumnTran.cpp
+++ b/jrj/project/business/AR/ExchangeColumnTran.cpp
@@ -98,9 +98,7 @@
{
dw_list.AcceptText();
xml x;
-
- xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg;
dw_list.DwUpdateAllTo(x);
arg.AddArg(L"content", x.xml());
if (getUrl(L"/sale/data/AR/update/tran/head", arg.GetString(), x) != 1)
@@ -119,9 +117,7 @@
int OnRetrieve()
{
xml x;
-
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
if (getUrl(L"/sale/data/AR/tran/head", arg.GetString(), x) != 1)
{
trace(x.text());
diff --git a/jrj/project/business/AR/ExchangeSignFast.cpp b/jrj/project/business/AR/ExchangeSignFast.cpp
index b6a51b4..5d09479 100644
--- a/jrj/project/business/AR/ExchangeSignFast.cpp
+++ b/jrj/project/business/AR/ExchangeSignFast.cpp
@@ -328,9 +328,7 @@
{
HCURSOR hCursor = xutil::SetCursorWait();
xml x;
-
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
int row = dw_obj->GetRow();
if (row < 1) return 1;
xstring CustomerID = dw_obj->GetItemString(row, L"CustomerID");
diff --git a/jrj/project/business/Company/CompanyList.cpp b/jrj/project/business/Company/CompanyList.cpp
index 215bcab..42ece34 100644
--- a/jrj/project/business/Company/CompanyList.cpp
+++ b/jrj/project/business/Company/CompanyList.cpp
@@ -53,9 +53,7 @@
int OnRetrieve()
{
xml x;
-
xaserverarg arg;
-
//arg.AddArg(L"sType",c_type);
if (xurl::get(L"OrganizationStruct/list.CompanyInfo", arg.GetString(), x) != 1)
{
diff --git a/jrj/project/business/Company/CompanyMaint.cpp b/jrj/project/business/Company/CompanyMaint.cpp
index 518d0ae..0eb9c66 100644
--- a/jrj/project/business/Company/CompanyMaint.cpp
+++ b/jrj/project/business/Company/CompanyMaint.cpp
@@ -158,7 +158,6 @@
val = xdoc.xml();
trace(val);
xaserverarg args;
- args.setNativePointer(args.CreateInstance());
args.AddArg(L"content", val);
args.AddArg(L"dbmap", L"CompanyInfo.dbmap");
//trace(m_EntityValueEx);
@@ -213,9 +212,7 @@
xstring col = dwhdr.colname;
if (col != L"") {
xml x;
-
xaserverarg arg;
-
xstring query;
query = L"[IResourceMSSql.xq]";
if (col == L"TradeType") {
@@ -311,9 +308,7 @@
int OnRetrieve()
{
xml x;
-
xaserverarg arg;
-
arg.AddArg(L"guid", m_sguid);
//trace(m_sguid);
//if (xurl::get(L"OrganizationStruct/detail.CompanyInfo",arg.GetString(),x) != 1)
diff --git a/jrj/project/business/Company/HrEmployeeAdd.cpp b/jrj/project/business/Company/HrEmployeeAdd.cpp
index 4de852c..1c330ef 100644
--- a/jrj/project/business/Company/HrEmployeeAdd.cpp
+++ b/jrj/project/business/Company/HrEmployeeAdd.cpp
@@ -60,9 +60,7 @@
xcontrol xc = GetControl(L"QueryTxt");
m_sTxt = xc.GetText() + L"";
xml x;
-
xaserverarg arg;
-
arg.AddArg(L"sTxt", m_sTxt);
if (xurl::post(L"OrganizationStruct/select.Employee", arg.GetString(), x) != 1)
{
diff --git a/jrj/project/business/Company/HrJob.cpp b/jrj/project/business/Company/HrJob.cpp
index 4eef7fe..ba496db 100644
--- a/jrj/project/business/Company/HrJob.cpp
+++ b/jrj/project/business/Company/HrJob.cpp
@@ -59,9 +59,7 @@
{
xstring query = L"[MSSqlHrJob.xq]";
xml x;
-
xaserverarg arg;
-
arg.AddArg(L"type", m_type);
//if (xaserver::ExecXQuery(GetServerUrl(),query,arg.GetString(),x)!=1)
if (xurl::post(L"OrganizationStruct/list.Job", arg.GetString(), x) != 1)
diff --git a/jrj/project/business/Company/HrOrgType.cpp b/jrj/project/business/Company/HrOrgType.cpp
index 5179465..60551d9 100644
--- a/jrj/project/business/Company/HrOrgType.cpp
+++ b/jrj/project/business/Company/HrOrgType.cpp
@@ -65,7 +65,6 @@
xstring val = xdoc.xml();
xaserverarg args;
- args.setNativePointer(args.CreateInstance());
args.AddArg(L"content", val);
//trace(val);
//return 1;
diff --git a/jrj/project/business/Company/HrPersonMaint.cpp b/jrj/project/business/Company/HrPersonMaint.cpp
index 326a178..f1fccf2 100644
--- a/jrj/project/business/Company/HrPersonMaint.cpp
+++ b/jrj/project/business/Company/HrPersonMaint.cpp
@@ -68,7 +68,7 @@
val = xdoc.xml();
//trace(val);
xaserverarg args;
- args.setNativePointer(args.CreateInstance());
+
args.AddArg(L"content", val);
//trace(m_EntityValueEx);
//trace(val);
diff --git a/jrj/project/business/Customer3.maint.cpp b/jrj/project/business/Customer3.maint.cpp
index 936c46f..d2c8ebd 100644
--- a/jrj/project/business/Customer3.maint.cpp
+++ b/jrj/project/business/Customer3.maint.cpp
@@ -143,10 +143,11 @@
xml x1=new xml;
xaserverarg arg;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"sname", sName);
arg.AddArg(L"type",sType);
- if(xurl::get(L"/sale/data/"+GetEntityName(1)+L"/pref/searchname",arg.GetString(),x1)!=1)
+
+ if(xurl::get(L"/sale/data/"+GetEntityName(1)+ L"/pref/searchname",arg.GetString(),x1)!=1)
{
xstring error = x1.text();
//alert(L"/sale/data/"+GetEntityName(1)+L"/pref/searchname");
diff --git a/jrj/project/business/Expense/VATInvoiceAdd.cpp b/jrj/project/business/Expense/VATInvoiceAdd.cpp
index 09d3f9a..fac5f92 100644
--- a/jrj/project/business/Expense/VATInvoiceAdd.cpp
+++ b/jrj/project/business/Expense/VATInvoiceAdd.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/VATNotityListShiftToList.cpp b/jrj/project/business/Expense/VATNotityListShiftToList.cpp
index 2e2b186..85f02e2 100644
--- a/jrj/project/business/Expense/VATNotityListShiftToList.cpp
+++ b/jrj/project/business/Expense/VATNotityListShiftToList.cpp
Binary files differ
diff --git a/jrj/project/business/PO/InsertPO.PO.cpp b/jrj/project/business/PO/InsertPO.PO.cpp
index 120fc92..1018358 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/SO/Product.FetchNo.cpp b/jrj/project/business/SO/Product.FetchNo.cpp
index 6380c19..ba181f4 100644
--- a/jrj/project/business/SO/Product.FetchNo.cpp
+++ b/jrj/project/business/SO/Product.FetchNo.cpp
@@ -73,7 +73,6 @@
int SendNotice()
{
xaserverarg arg;
-
if (dw_list.GetRowCount() < 1) return 1;
xstring Subject = L"编号：" + dw_list.GetItemString(dw_list.GetRow(), L"SKUNo") + L" 品名：" + dw_list.GetItemString(dw_list.GetRow(), L"CName") + L"，申请货号";
xstring EntityID = dw_list.GetItemString(dw_list.GetRow(), L"SKUID");
@@ -95,7 +94,6 @@
dw_list.DwUpdateAllToEx(x);
xstring error = L"";
xaserverarg arg;
-
arg.AddArg(L"content", x.xml());
if (xurl::get(L"/sale/data/ProductLibrary3/update/product/askgoodsno", arg.GetString(), x) != 1)
{
diff --git a/jrj/project/business/SO/select.item.so.cpp b/jrj/project/business/SO/select.item.so.cpp
index 692c54c..e04e5fe 100644
--- a/jrj/project/business/SO/select.item.so.cpp
+++ b/jrj/project/business/SO/select.item.so.cpp
@@ -134,8 +134,6 @@
dw_list.SetColumnState(L"PaperPODate", false);
xml x;
-
-
xaserverarg arg;
if (arg)
{
diff --git a/jrj/project/business/Supplier.maint.cpp b/jrj/project/business/Supplier.maint.cpp
index 7bc124f..cfc05c3 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/Inspection.Supplie.cpp b/jrj/project/business/Supplier/Inspection.Supplie.cpp
index f3584e1..c670148 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 2332186..ebdb31a 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/VATInvoiceNew.cpp b/jrj/project/business/VATNotify/VATInvoiceNew.cpp
index 0bf8ddc..5ccdc96 100644
--- a/jrj/project/business/VATNotify/VATInvoiceNew.cpp
+++ b/jrj/project/business/VATNotify/VATInvoiceNew.cpp
@@ -201,10 +201,8 @@
dw_2.AcceptText();
xstring error;
xstring str;
- xml x ;
- xaserverarg arg ;
-
-
+ xml x;
+ xaserverarg arg;
dw_1.DwUpdateAllToEx(x);
xml x0 = new xml;
@@ -326,7 +324,8 @@
int row = hdr.row;
if(value==L"") return 1;
- if(colname==L"VATAmount"){
+ if(colname==L"VATAmount")
+ {
double VATAmount=dw_1.GetItemDouble(row,L"VATAmount");
double billAmtt= dw_1.GetItemDouble(row,L"VATBillAmount");
@@ -468,8 +467,7 @@
int OnRetrieve()
{
xml x;
-
- xaserverarg arg ;
+ xaserverarg arg;
arg.AddArg(L"QueryTxt",xcontrol(GetControl(L"sle_search")).GetText());
arg.AddArg(L"QueryArg",L"<arg/>");
@@ -503,8 +501,6 @@
xml x;
-
-
xaserverarg arg = GetArg();
if(arg)
{
@@ -514,16 +510,12 @@
}
OnAttachEvent();
//OnRetrieve();
-
-
return 1;
}
int onloaded()
{
//SetAgent();
-
-
return 1;
}
};
\ No newline at end of file
diff --git a/jrj/project/business/VATNotify/VATNotifyParse.cpp b/jrj/project/business/VATNotify/VATNotifyParse.cpp
index d2e53e2..6e2908e 100644
--- a/jrj/project/business/VATNotify/VATNotifyParse.cpp
+++ b/jrj/project/business/VATNotify/VATNotifyParse.cpp
@@ -51,7 +51,6 @@
int OnOk()
{
-
xaserverarg arg = GetArg();
arg.AddArg(L"process", L"ok");
arg.AddArg(L"Quantity", dw_base.GetItemString(1, L"Quantity"));
diff --git a/jrj/project/business/VATNotify/update.vatnotify.cpp b/jrj/project/business/VATNotify/update.vatnotify.cpp
index 709e11f..b78216b 100644
--- a/jrj/project/business/VATNotify/update.vatnotify.cpp
+++ b/jrj/project/business/VATNotify/update.vatnotify.cpp
@@ -54,8 +54,7 @@
int OnSave()
{
- xml x ;
-
+ xml x;
dw_list.AcceptText();
dw_list.DwUpdateAllToEx(x);
xaserverarg arg;
@@ -252,8 +251,7 @@
int RetrieveCustomSource(xstring classifyID, xstring supplierID)
{
- xml x ;
-
+ xml x;
xaserverarg arg ;
if (GetWinParam())
--
Gitblit v1.9.3