From 9ac9cc9e9cd91b97d35a6e28400df71630765e40 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 21 八月 2024 14:35:51 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/AR/ExchageInput3.cpp | 2
jrj/project/business/ProductSample/ProductNewItem.cpp | 0
jrj/project/business/VATNotify/list.vatinvoice.cpp | 2
jrj/project/printview/Template.Print.ViewEx.cpp | 1
jrj/project/business/SystemSettings/view.assignadjust.cpp | 18 ++--
jrj/project/business/VATNotify/simple.maint.vatnotify.cpp | 8 +-
jrj/project/business/VATNotify/import.vatnotify.cpp | 9 +-
jrj/project/business/Expense/APNew.cpp | 0
jrj/project/business/Expense/APOther.cpp | 0
jrj/project/business/SystemSettings/FlowTermImport.cpp | 4
jrj/project/business/AR/Deduction.cpp | 2
jrj/project/business/SystemSettings/level.Customer.v3.cpp | 30 +++----
jrj/project/business/VATNotify/list.vatnotify.cpp | 10 +-
jrj/project/business/SystemSettings/Data.config.cpp | 4
jrj/project/business/VATNotify/maint.papercard.vatnotify.cpp | 8 +-
jrj/project/business/Supplier/maint.Document.Supplier.cpp | 0
jrj/project/business/AP/list.manageSupplierID.ap.cpp | 2
jrj/project/business/SystemSettings/UserImport.cpp | 2
jrj/project/business/BasicCode/AccountUnitMaint.cpp | 2
jrj/project/business/Expense/VATInvoiceAdd.cpp | 0
jrj/project/business/AR/maint.SettlementExchange.cpp | 5 -
jrj/project/business/SystemSettings/LogList.cpp | 6
jrj/project/business/VATNotify/del.vatinvoice.cpp | 2
jrj/project/printview/Template.Print.Dialog.cpp | 2
jrj/project/business/SystemSettings/FlowTermSelect.cpp | 9 -
jrj/project/business/SO/delivery.base.maint.so.cpp | 4
jrj/project/business/SystemSettings/Flow3.cpp | 8 -
jrj/project/business/SystemSettings/UserPassDlg.cpp | 5
jrj/project/business/Supplier/list.Owner.Supplier.cpp | 0
jrj/project/business/AR/ExchangeSignFast.cpp | 2
jrj/project/total3/ProductNewList.cpp | 26 +++---
jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp | 4
jrj/project/business/SystemSettings/ProcessManagement.cpp | 2
jrj/ext-jrj/ext-jrj.vcxproj | 2
jrj/project/business/Public/message.business.cpp | 0
jrj/project/tradedocument/TDocumentWin.cpp | 1
36 files changed, 75 insertions(+), 107 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index c621bcb..7dd7ca0 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -1050,7 +1050,7 @@
<ClCompile Include="..\project\total3\FactoryPayment.cpp" />
<ClCompile Include="..\project\total3\GDNItem.GDN.cpp" />
<ClCompile Include="..\project\total3\ProductNewList.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\total3\ProductNoOut.SO.cpp" />
diff --git a/jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp b/jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp
index cbc4166..5a61edf 100644
--- a/jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp
+++ b/jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp
@@ -236,9 +236,7 @@
int OnRetrieve(xstring query)
{
xml x ;
-
- xaserverarg arg ;
-
+ xaserverarg arg;
arg.AddArg(L"query",query);
arg.AddArg(L"QueryArg",L"");
if (getUrl(str_url,arg.GetString(),x)!=1)
diff --git a/jrj/project/business/AP/list.manageSupplierID.ap.cpp b/jrj/project/business/AP/list.manageSupplierID.ap.cpp
index c769da4..5cef71f 100644
--- a/jrj/project/business/AP/list.manageSupplierID.ap.cpp
+++ b/jrj/project/business/AP/list.manageSupplierID.ap.cpp
@@ -96,7 +96,7 @@
int h = xcombobox::GetCurSel(evt->command.hCtrl);
if(h > -1)
{
- xstring txt = xcombobox::GetLBText(evt->command.hCtrl, h);
+ xstring txt = (string)xcombobox::GetLBText(evt->command.hCtrl, h);
if(txt==L"出运日期")
{
diff --git a/jrj/project/business/AR/Deduction.cpp b/jrj/project/business/AR/Deduction.cpp
index cb4571d..8a1ad3f 100644
--- a/jrj/project/business/AR/Deduction.cpp
+++ b/jrj/project/business/AR/Deduction.cpp
@@ -157,9 +157,7 @@
int OnRetrieve(xstring InvoiceNo, xstring EntityID)
{
xml x;
-
xaserverarg arg ;
-
arg.AddArg(L"InvoiceNo", InvoiceNo);
arg.AddArg(L"InvoiceNoEx", xcontrol(GetControl(L"search")).GetText());
arg.AddArg(L"EntityID", EntityID);
diff --git a/jrj/project/business/AR/ExchageInput3.cpp b/jrj/project/business/AR/ExchageInput3.cpp
index ab505d1..2520729 100644
--- a/jrj/project/business/AR/ExchageInput3.cpp
+++ b/jrj/project/business/AR/ExchageInput3.cpp
@@ -306,7 +306,7 @@
}
if (frow > dw_list.GetRowCount()) return 1;
dw_list.SetRow(frow);
- OpenWindow(L"dev:xpage[ExchangeSignFast.vx]", (WPARAM)&dw_list);
+ OpenWindow(L"dev:xpage[ExchangeSignFast.vx]", (LPARAM)dw_list.getNativePointer());
return 1;
}
else if (comdid == L"xmAdd")
diff --git a/jrj/project/business/AR/ExchangeSignFast.cpp b/jrj/project/business/AR/ExchangeSignFast.cpp
index 71177b6..c55f9a2 100644
--- a/jrj/project/business/AR/ExchangeSignFast.cpp
+++ b/jrj/project/business/AR/ExchangeSignFast.cpp
@@ -406,7 +406,7 @@
/*xaserverarg arg = GetParam();
xstring CustomerIDOne = arg.GetArgString(L"CustomerID");
xstring SEIDOne = arg.GetArgString(L"SEID");*/
- if (GetWinParam())dw_obj = *(xdwgrid*)GetWinParam();
+ if (GetWinParam())dw_obj = (kdwgrid*)GetWinParam();
OnAttachEvent();
return 1;
diff --git a/jrj/project/business/AR/maint.SettlementExchange.cpp b/jrj/project/business/AR/maint.SettlementExchange.cpp
index 7a6b5ce..ae13b46 100644
--- a/jrj/project/business/AR/maint.SettlementExchange.cpp
+++ b/jrj/project/business/AR/maint.SettlementExchange.cpp
@@ -56,7 +56,6 @@
int OnSave(bool dlg = true)
{
xml x;
-
dw_base.AcceptText();
dw_base.DwUpdateAllTo(x);
xaserverarg arg ;
@@ -114,8 +113,6 @@
int OnSign()
{
xaserverarg arg ;
-
-
xml x;
dw_base.AcceptText();
@@ -183,9 +180,7 @@
int OnRetrieve(xstring SettlementExchangeID)
{
xml x;
-
xaserverarg arg ;
-
arg.AddArg(L"SEID", SettlementExchangeID);
if (getUrl(L"/sale/data/AR/se/getsebyid", arg.GetString(), x) != 1)
diff --git a/jrj/project/business/BasicCode/AccountUnitMaint.cpp b/jrj/project/business/BasicCode/AccountUnitMaint.cpp
index 2212b83..9ac358a 100644
--- a/jrj/project/business/BasicCode/AccountUnitMaint.cpp
+++ b/jrj/project/business/BasicCode/AccountUnitMaint.cpp
@@ -90,10 +90,8 @@
int OnSave()
{
xml x;
-
dw_list.DwUpdateAllToEx(x);
xaserverarg arg;
-
arg.AddArg(L"content",x.xml());
if (xurl::get(L"/sale/data/TradeFinance3/accountunit/update",arg.GetString(),x) != 1)
{
diff --git a/jrj/project/business/Expense/APNew.cpp b/jrj/project/business/Expense/APNew.cpp
index b703bed..94f285f 100644
--- a/jrj/project/business/Expense/APNew.cpp
+++ b/jrj/project/business/Expense/APNew.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/APOther.cpp b/jrj/project/business/Expense/APOther.cpp
index 1a3356f..e759bec 100644
--- a/jrj/project/business/Expense/APOther.cpp
+++ b/jrj/project/business/Expense/APOther.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/VATInvoiceAdd.cpp b/jrj/project/business/Expense/VATInvoiceAdd.cpp
index 90e7a21..09d3f9a 100644
--- a/jrj/project/business/Expense/VATInvoiceAdd.cpp
+++ b/jrj/project/business/Expense/VATInvoiceAdd.cpp
Binary files differ
diff --git a/jrj/project/business/ProductSample/ProductNewItem.cpp b/jrj/project/business/ProductSample/ProductNewItem.cpp
index 1f0b244..0968fe4 100644
--- a/jrj/project/business/ProductSample/ProductNewItem.cpp
+++ b/jrj/project/business/ProductSample/ProductNewItem.cpp
Binary files differ
diff --git a/jrj/project/business/Public/message.business.cpp b/jrj/project/business/Public/message.business.cpp
index 5a86bbc..0677451 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/SO/delivery.base.maint.so.cpp b/jrj/project/business/SO/delivery.base.maint.so.cpp
index 28e6d2a..a464f22 100644
--- a/jrj/project/business/SO/delivery.base.maint.so.cpp
+++ b/jrj/project/business/SO/delivery.base.maint.so.cpp
@@ -7,7 +7,7 @@
#include "viewobject/view.base.hpp"
-
+using xml = KXMLDOMDocument;
class __declspec(dllexport) DeliveryEdit : public xframe
{
public:
@@ -157,7 +157,7 @@
xml x;
x ;
- x.LoadXml(vc.GetContent());
+ x.loadXML(vc.GetContent());
dw_1.Retrieve(x);
diff --git a/jrj/project/business/Supplier/list.Owner.Supplier.cpp b/jrj/project/business/Supplier/list.Owner.Supplier.cpp
index 4d2f3a5..137f5d5 100644
--- a/jrj/project/business/Supplier/list.Owner.Supplier.cpp
+++ b/jrj/project/business/Supplier/list.Owner.Supplier.cpp
Binary files differ
diff --git a/jrj/project/business/Supplier/maint.Document.Supplier.cpp b/jrj/project/business/Supplier/maint.Document.Supplier.cpp
index 306a761..c672ef0 100644
--- a/jrj/project/business/Supplier/maint.Document.Supplier.cpp
+++ b/jrj/project/business/Supplier/maint.Document.Supplier.cpp
Binary files differ
diff --git a/jrj/project/business/SystemSettings/Data.config.cpp b/jrj/project/business/SystemSettings/Data.config.cpp
index c3f0327..0af5433 100644
--- a/jrj/project/business/SystemSettings/Data.config.cpp
+++ b/jrj/project/business/SystemSettings/Data.config.cpp
@@ -162,7 +162,7 @@
{
xstring str = L"<vbox><xtree name='dw_tree" + xstring(nIndex) + L"' imagelist='0'/></vbox>";
bnode = new xnode;
- bnode.setNativePointer(SetAgentNodeContent(anode, str));
+ bnode.setNativePointer(SetAgentNode(anode, str));
p = combobox::GetItemData(dw_ddlb.GetId(), nIndex);
KXMLDOMElement ele = p;
@@ -182,7 +182,7 @@
{
p = combobox::GetItemData(dw_ddlbdata.GetId(), h);
bnode = p;
- SetAgentNodeContent(anode, bnode);
+ SetAgentNode(anode, bnode);
dw_tree = new treeview;
dw_tree.setNativePointer(GetControl(L"dw_tree" + xstring(nIndex)));
diff --git a/jrj/project/business/SystemSettings/Flow3.cpp b/jrj/project/business/SystemSettings/Flow3.cpp
index d03622e..e4246a6 100644
--- a/jrj/project/business/SystemSettings/Flow3.cpp
+++ b/jrj/project/business/SystemSettings/Flow3.cpp
@@ -142,7 +142,6 @@
}
xaserverarg arg ;
- ;
arg.AddArg(L"content",x.xml());
arg.AddArg(L"sdbmap",sdbmap);
trace(x.xml());
@@ -206,7 +205,6 @@
//trace(colname);
xaserverarg arg ;
- ;
xstring comdid =L"";
xstring data=L"";
@@ -285,7 +283,6 @@
xdwgrid dw_list = GetSheetDwgrid(i);
xaserverarg arg ;
- ;
arg.SetArg(L"stype",GetSheetType(i),L"xstring");
arg.SetArg(L"sdata",L"ddd",L"xstring");
arg.SetArg(L"flowID",flowid,L"xstring");
@@ -300,10 +297,9 @@
{
if(flowid==L"") return 1;
- xml x ;
+ xml x;
- xaserverarg arg ;
- ;
+ xaserverarg arg;
//int i = tab_1.GetSheetIndex();
for(int i=0;i<7;i++)
diff --git a/jrj/project/business/SystemSettings/FlowTermImport.cpp b/jrj/project/business/SystemSettings/FlowTermImport.cpp
index 38723d6..3fb8512 100644
--- a/jrj/project/business/SystemSettings/FlowTermImport.cpp
+++ b/jrj/project/business/SystemSettings/FlowTermImport.cpp
@@ -120,10 +120,8 @@
int OnRetrieve()
{
- xml x ;
-
+ xml x;
xaserverarg arg ;
- ;
arg.AddArg(L"stype",stype);
arg.AddArg(L"sdata",sdata);
diff --git a/jrj/project/business/SystemSettings/FlowTermSelect.cpp b/jrj/project/business/SystemSettings/FlowTermSelect.cpp
index ce9d2bb..fc62b88 100644
--- a/jrj/project/business/SystemSettings/FlowTermSelect.cpp
+++ b/jrj/project/business/SystemSettings/FlowTermSelect.cpp
@@ -60,8 +60,7 @@
int OnOK(xstring comdid)
{
- xaserverarg arg ;
- arg = GetArg();
+ xaserverarg arg = GetArg();
arg.AddArg(L"comdid",comdid);
@@ -119,10 +118,8 @@
int OnRetrieve()
{
- xml x ;
-
- xaserverarg arg ;
- ;
+ xml x;
+ xaserverarg arg;
arg.AddArg(L"stype",stype);
arg.AddArg(L"sdata",sdata);
diff --git a/jrj/project/business/SystemSettings/LogList.cpp b/jrj/project/business/SystemSettings/LogList.cpp
index 21945f4..238e046 100644
--- a/jrj/project/business/SystemSettings/LogList.cpp
+++ b/jrj/project/business/SystemSettings/LogList.cpp
@@ -94,7 +94,7 @@
hCursor = xutil::SetCursorWait();
xstring str = dw_list.DataAnalysis(L"");
xaserverarg arg;
- ;
+
arg.AddArg(L"html", str);
OpenWindow(L"dev:xpage[data.vanalysis.vx]", arg);
@@ -108,7 +108,7 @@
int OnSearch()
{
xaserverarg arg;
- ;
+
arg.AddArg(L"text", searchStr);
OpenWindow(L"dev:xpage[search.dialog.vx]", arg);
xstring str = arg.GetArgString(L"text");
@@ -176,7 +176,7 @@
xml x ;
xaserverarg arg ;
- ;
+
arg.AddArg(L"arg",argstr);
//alert(argstr);
diff --git a/jrj/project/business/SystemSettings/ProcessManagement.cpp b/jrj/project/business/SystemSettings/ProcessManagement.cpp
index 1c95bc0..12ce011 100644
--- a/jrj/project/business/SystemSettings/ProcessManagement.cpp
+++ b/jrj/project/business/SystemSettings/ProcessManagement.cpp
@@ -177,8 +177,6 @@
{
SetAgent();
-
-
return 1;
}
};
\ No newline at end of file
diff --git a/jrj/project/business/SystemSettings/UserImport.cpp b/jrj/project/business/SystemSettings/UserImport.cpp
index fb7b0a7..2180585 100644
--- a/jrj/project/business/SystemSettings/UserImport.cpp
+++ b/jrj/project/business/SystemSettings/UserImport.cpp
@@ -311,7 +311,7 @@
int OnInitial()
{
SetAgent();
- OnAttachEvent();
+ OnAttachEvent();
return 1;
}
diff --git a/jrj/project/business/SystemSettings/UserPassDlg.cpp b/jrj/project/business/SystemSettings/UserPassDlg.cpp
index 10d6ab1..8e27cd0 100644
--- a/jrj/project/business/SystemSettings/UserPassDlg.cpp
+++ b/jrj/project/business/SystemSettings/UserPassDlg.cpp
@@ -85,9 +85,8 @@
xstring newpass = xutil::MD5(str1);
xml x;
-
- xaserverarg arg ;
- ;
+ xaserverarg arg;
+
arg.AddArg(L"old_password",oldpass);
arg.AddArg(L"new_password",newpass);
diff --git a/jrj/project/business/SystemSettings/level.Customer.v3.cpp b/jrj/project/business/SystemSettings/level.Customer.v3.cpp
index f7be604..a4b1a7e 100644
--- a/jrj/project/business/SystemSettings/level.Customer.v3.cpp
+++ b/jrj/project/business/SystemSettings/level.Customer.v3.cpp
@@ -35,10 +35,9 @@
}
int OnPreRetrieve()
{
- xml x ;
-
- xaserverarg arg ;
- ;
+ xml x;
+ xaserverarg arg;
+
arg.AddArg(L"pageindex", xstring(PIndex)); //第几页
arg.AddArg(L"pagenumber", xstring(m_pageNumber)); //每页数量
arg.AddArg(L"QueryTxt",m_QueryTxt );
@@ -132,10 +131,9 @@
while (tv_1.GetRootItem())
tv_1.DeleteItem(tv_1.GetRootItem());
- xml x ;
-
- xaserverarg arg ;
- ;
+ xml x;
+ xaserverarg arg;
+
arg.AddArg(L"sType",sType);
if(getUrl(L"/sale/data/"+GetEntityName(1)+L"/pref/list/tree",arg.GetString(),x)!=1)
{
@@ -195,10 +193,9 @@
int MB_YESNO = 0x00000004;
int IDYES = 6;
if(MessageBox(GetHWND(),L"确认要删除客户 "+sName+L" 的信息吗？",L"提示",MB_YESNO)!=IDYES) return 1;
- xml x ;
+ xml x;
+ xaserverarg arg;
- xaserverarg arg ;
- ;
arg.AddArg(L"guid",sguid);
if (xurl::post(L"/sale/data/"+GetEntityName(1)+L"/entity/delete",arg.GetString(),x) != 1)
{
@@ -232,8 +229,8 @@
//设置层级弹出窗与保存
int OnLevelCustomer()
{
- xaserverarg arg ;
- ;
+ xaserverarg arg;
+
OpenWindow(L"dev:xpage[maint.Level.Customer3.vx]", arg);
xml ux ;
@@ -243,7 +240,7 @@
if(arg.GetArgString(L"ok")==L"true")
{
- xml x ;
+ xml x;
x.loadXML(arg.GetArgString(L"arg"));
KXMLDOMElement uele = x.documentElement();
@@ -305,10 +302,9 @@
int row = hdr.row;
KXMLDOMElement ele = listwin::dw_list.GetRowElement(row);
xstring entity = ele.selectSingleNode(L"CustomerID").text();
- xml x ;
+ xml x;
+ xaserverarg arg;
- xaserverarg arg ;
- ;
arg.AddArg(L"EntityID",entity);
if (getUrl(L"/sale/data/CustomerV3/entity/customeritem",arg.GetString(),x)!=1)
{
diff --git a/jrj/project/business/SystemSettings/view.assignadjust.cpp b/jrj/project/business/SystemSettings/view.assignadjust.cpp
index 8969135..20cd4e8 100644
--- a/jrj/project/business/SystemSettings/view.assignadjust.cpp
+++ b/jrj/project/business/SystemSettings/view.assignadjust.cpp
@@ -51,13 +51,11 @@
int OnSave()
{
- xml x ;
+ xml x;
dw_list.AcceptText();
dw_list.DwUpdateAllToEx(x);
- xaserverarg arg ;
-
-
+ xaserverarg arg;
xml x0;
x0.loadXML(L"<data/>");
KXMLDOMNodeList t = x.selectNodes(L"data/node()[(@update.new='1') or (@update.modify='1') or (@update.delete='1') ]");
@@ -113,7 +111,7 @@
int OnSearch()
{
xaserverarg arg;
- ;
+
arg.AddArg(L"text", searchStr);
OpenWindow(L"dev:xpage[search.dialog.vx]", arg);
xstring str = arg.GetArgString(L"text");
@@ -217,13 +215,14 @@
return 1;
}
- int ShowRetrieveingTip()
+ int ShowRetrieveingTip()
{
dataretrieveing = true;
xwin* pwin = OpenWindow(L"dev:xpage[TestRetrieveing.vx]");
hWndRetrieveTip = pwin->GetHWND();
return 1;
}
+
int CloseRetrieveTip()
{
dataretrieveing = false;
@@ -238,10 +237,9 @@
if(!rptEle) return 0;
dw_list.Reset();
- xml x ;
-
- xaserverarg arg ;
- ;
+ xml x;
+ xaserverarg arg;
+
arg.AddArg(L"arg",argstr);
if (xurl::get(dataurl,arg.GetString(),x)!=1)
{
diff --git a/jrj/project/business/VATNotify/del.vatinvoice.cpp b/jrj/project/business/VATNotify/del.vatinvoice.cpp
index 4fb524d..ee828d0 100644
--- a/jrj/project/business/VATNotify/del.vatinvoice.cpp
+++ b/jrj/project/business/VATNotify/del.vatinvoice.cpp
@@ -84,7 +84,7 @@
{
int row = dw_list.GetRow();
xstring VATInvoiceID = dw_list.GetItemString(row,L"VATInvoiceID");
- alert(VATInvoiceID);
+ //alert(VATInvoiceID);
int MB_OKCANCEL = 1;
int IDOK = 1;
int ret = MessageBox(GetHWND(),L"确认恢复?",L"提示",MB_OKCANCEL);
diff --git a/jrj/project/business/VATNotify/import.vatnotify.cpp b/jrj/project/business/VATNotify/import.vatnotify.cpp
index 963a6d1..2eb847b 100644
--- a/jrj/project/business/VATNotify/import.vatnotify.cpp
+++ b/jrj/project/business/VATNotify/import.vatnotify.cpp
@@ -77,9 +77,9 @@
int OnImport2()
{
xml x;
-
xaserverarg arg;
- for(int row=1; row<= dw_list.GetRowCount();row++){
+ for(int row=1; row<= dw_list.GetRowCount();row++)
+ {
KXMLDOMElement ele = dw_list.GetRowElement(row);
xstring invno = ele.selectSingleNode(L"InvoiceNo").text();
arg.AddArg(L"InvoiceNo",invno);
@@ -95,9 +95,8 @@
}
return 1;
}
-
-
-
+
+
//命令发布函数
int OnCmdDispatch(xstring comdid)
{
diff --git a/jrj/project/business/VATNotify/list.vatinvoice.cpp b/jrj/project/business/VATNotify/list.vatinvoice.cpp
index 676622e..7f299f7 100644
--- a/jrj/project/business/VATNotify/list.vatinvoice.cpp
+++ b/jrj/project/business/VATNotify/list.vatinvoice.cpp
@@ -283,7 +283,7 @@
xml x ;
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"QueryTxt",xcontrol(GetControl(L"sle_search")).GetText());
arg.AddArg(L"QueryArg",GetQueryArg());
arg.AddArg(L"DatePicker",DatePicker);
diff --git a/jrj/project/business/VATNotify/list.vatnotify.cpp b/jrj/project/business/VATNotify/list.vatnotify.cpp
index 82305aa..ec83227 100644
--- a/jrj/project/business/VATNotify/list.vatnotify.cpp
+++ b/jrj/project/business/VATNotify/list.vatnotify.cpp
@@ -70,7 +70,6 @@
if (colname == L"SONo")
{
xstring SONo = dw_list.GetItemString(row, colname.c_str());
- ;
arg.AddArg(L"EntityNo", SONo);
arg.AddArg(L"ReadOnly", L"true");
@@ -79,7 +78,6 @@
if (colname == L"InvoiceNo")
{
xstring InvoiceNo = dw_list.GetItemString(row, colname.c_str());
- ;
arg.AddArg(L"EntityNo", InvoiceNo);
arg.AddArg(L"ReadOnly", L"true");
@@ -90,7 +88,7 @@
int OnPrint()
{
- xaserverarg& arg = *new xaserverarg;
+ xaserverarg arg ;
arg.AddArg(L"EntityName", L"VATNotify");
arg.AddArg(L"EntityID", L"", L"");
@@ -110,13 +108,13 @@
arg.AddArg(L"VATNotifyID", L"");
trace(InvoiceNo + L"==1" + NInvoiceNoEx + L"==2" + SupplierID + L"==3" + dw_list.GetGuid(dw_list.GetRow()));
- openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
+ openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", arg);
return 1;
}
int OnPrintItem()
{
- xaserverarg& arg = *new xaserverarg;
+ xaserverarg arg;
arg.AddArg(L"EntityName", L"VATNotify");
arg.AddArg(L"EntityID", L"", L"");
@@ -136,7 +134,7 @@
arg.AddArg(L"VATNotifyID", dw_list.GetGuid(dw_list.GetRow()));
trace(L"=====L" + InvoiceNo + L"=====L" + SupplierID + L"=====L" + dw_list.GetGuid(dw_list.GetRow()));
- openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
+ openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", arg);
return 1;
}
diff --git a/jrj/project/business/VATNotify/maint.papercard.vatnotify.cpp b/jrj/project/business/VATNotify/maint.papercard.vatnotify.cpp
index ca10bec..601fc00 100644
--- a/jrj/project/business/VATNotify/maint.papercard.vatnotify.cpp
+++ b/jrj/project/business/VATNotify/maint.papercard.vatnotify.cpp
@@ -56,25 +56,25 @@
int OnPrint()
{
- xaserverarg& arg = *new xaserverarg;
+ xaserverarg arg;
arg.AddArg(L"EntityName", L"VATNotify", L"");
arg.AddArg(L"EntityID", L"", L"");
arg.AddArg(L"EntityNo", dw_item.GetItemString(1, L"InvoiceNo"), L"");
- openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
+ openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", arg);
return 1;
}
int OnPrintItem()
{
- xaserverarg& arg = *new xaserverarg;
+ xaserverarg arg ;
arg.AddArg(L"EntityName", L"VATNotify", L"");
arg.AddArg(L"EntityID", L"", L"");
arg.AddArg(L"EntityNo", dw_item.GetItemString(1, L"InvoiceNo"), L"");
- openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
+ openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", arg);
return 1;
}
diff --git a/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp b/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp
index cac6ab8..f11d770 100644
--- a/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp
+++ b/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp
@@ -63,7 +63,7 @@
int OnPrint()
{
- xaserverarg& arg = *new xaserverarg;
+ xaserverarg arg;
arg.AddArg(L"EntityName", L"VATNotify");
arg.AddArg(L"EntityID", L"", L"");
@@ -74,13 +74,13 @@
arg.AddArg(L"SupplierID", SupplierID);
arg.AddArg(L"VATNotifyID", L"");
- openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
+ openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", arg);
return 1;
}
int OnPrintItem()
{
- xaserverarg& arg = *new xaserverarg;
+ xaserverarg arg;
arg.AddArg(L"EntityName", L"VATNotify", L"");
arg.AddArg(L"EntityID", L"", L"");
@@ -92,7 +92,7 @@
arg.AddArg(L"VATNotifyID", dw_item.GetGuid(dw_item.GetRow()));
trace(InvoiceNo + L"====L" + dw_item.GetGuid(dw_item.GetRow()));
- openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
+ openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", arg);
return 1;
}
diff --git a/jrj/project/printview/Template.Print.Dialog.cpp b/jrj/project/printview/Template.Print.Dialog.cpp
index 7b58fbd..51aa67d 100644
--- a/jrj/project/printview/Template.Print.Dialog.cpp
+++ b/jrj/project/printview/Template.Print.Dialog.cpp
@@ -375,7 +375,7 @@
xml x;
xaserverarg arg;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"EntityName", m_EntityName, L"");
arg.AddArg(L"EntityID", m_EntityID, L"");
arg.AddArg(L"susername", susername, L""); //
diff --git a/jrj/project/printview/Template.Print.ViewEx.cpp b/jrj/project/printview/Template.Print.ViewEx.cpp
index 2c1e1ab..f622ea1 100644
--- a/jrj/project/printview/Template.Print.ViewEx.cpp
+++ b/jrj/project/printview/Template.Print.ViewEx.cpp
@@ -419,7 +419,6 @@
xstring DownLoadPaperPic(xstring guid)
{
-
xstring path = xutil::GetModuleTmpPath();
xstring ext = L"jpg";
xstring filename = guid + L"." + ext;
diff --git a/jrj/project/total3/ProductNewList.cpp b/jrj/project/total3/ProductNewList.cpp
index 93a0616..9834f2e 100644
--- a/jrj/project/total3/ProductNewList.cpp
+++ b/jrj/project/total3/ProductNewList.cpp
@@ -88,6 +88,7 @@
dw_list.SetReadOnlyColumn(i);
}
dw_list.Redraw();
+ return 1;
}
int OnRetrieveEx()
@@ -121,6 +122,7 @@
dw_list.SetReadOnlyColumn(i);
}
dw_list.Redraw();
+ return 1;
}
xml GetGoodsPropList(xstring guid)
@@ -460,17 +462,16 @@
{
if (dw_list.GetItemString(dw_list.GetRow(), L"GoodsNo") != L"") return 1;
if (dw_list.GetRowCount() < 1) return 1;
- xaserverarg arg ;
-
+ xaserverarg arg;
+
arg.AddArg(L"EntityID", dw_list.GetGuid(dw_list.GetRow()));
KXMLDOMElement e = dw_list.GetRowElement(dw_list.GetRow());
- int pr = cast(e as int);
- arg.AddArg(L"data",xstring( pr));
- pr = cast(dw_list as int);
- arg.AddArg(L"dw", pr.toString());
- arg.AddArg(L"HWND", xstring((__int64)GetHWND()));
- OpenWindow(L"dev:xpage[ProductNewItem.vx]", arg );
+ arg.SetParam(L"data", e);
+ arg.SetParam(L"dw", dw_list);
+ arg.SetParam(L"HWND", GetHWND());
+ OpenWindow(L"dev:xpage[ProductNewItem.vx]", arg);
return 1;
+
}
//命令发布函数
@@ -505,17 +506,17 @@
if (comdid == L"xmDelete")
{
- int row = listwin::dw_list.GetNextSelectRow(1);
+ int row = dw_list.GetNextSelectRow(1);
if (row < 1) {
- row = listwin::dw_list.GetRow();
+ row = dw_list.GetRow();
if (row < 1) {
//win::MessageBox(GetHWND(),L"请选中要删除的行！",L"提示",0);
return -1;
}
}
- KXMLDOMElement e = listwin::dw_list.GetRowElement(row);
+ KXMLDOMElement e = dw_list.GetRowElement(row);
xstring sguid = e.selectSingleNode(L"@guid").text();
@@ -544,7 +545,7 @@
else
{
MessageBox(GetHWND(), L"删除成功！", L"提示", 0);
- listwin::dw_list.DeleteRow(row);
+ dw_list.DeleteRow(row);
}
}
return 1;
@@ -571,6 +572,7 @@
AttachEvent(L"WM_SETFOCUS", (FEvent)&ProductNewList::OnSetFocus);
AttachEvent(L"dw_list", L"DWV_ROWFOCUSCHANGED", (FEvent)&ProductNewList::OnRowChanged);
AttachEvent(L"im1", L"IMG_LDBCLICK", (FEvent)&ProductNewList::OnImgDBClicked);
+ return 1;
}
int onload()
diff --git a/jrj/project/tradedocument/TDocumentWin.cpp b/jrj/project/tradedocument/TDocumentWin.cpp
index df1a1c6..0619df7 100644
--- a/jrj/project/tradedocument/TDocumentWin.cpp
+++ b/jrj/project/tradedocument/TDocumentWin.cpp
@@ -149,7 +149,6 @@
xml x ;
xaserverarg args;
- args.setNativePointer(args.CreateInstance());
args.AddArg(L"myurl", myurl);
args.AddArg(L"name", ret);
args.AddArg(L"filepath", sname);
--
Gitblit v1.9.3