From c39c6bce6d945bd0878d82a5eca4c39f15a09301 Mon Sep 17 00:00:00 2001 From: xj qian <qianxj15@sina.com> Date: 星期五, 13 九月 2024 11:21:24 +0800 Subject: [PATCH] update --- jrj/project/business/GDN3.maint.cpp | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/jrj/project/business/GDN3.maint.cpp b/jrj/project/business/GDN3.maint.cpp index 5325a11..d261656 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"); @@ -248,12 +248,12 @@ return 1; } - xstring GetEntityID(int /*param*/ pr) + xstring GetEntityID(LPARAM /*param*/ pr) { return InvoiceID; } - xstring GetEntityName(int /*param*/ pr) + xstring GetEntityName(LPARAM /*param*/ pr) { return L"GDN3"; } @@ -505,7 +505,7 @@ //if(dw_base.GetItemString(1,L"GoodsSource") == L"") //{ - // alert(L"请选择货物产地(货物产地:开票工厂金额最大的工厂所属地)L"); + // alert(L"请选择货物产地(货物产地:开票工厂金额最大的工厂所属地)"); // return 0; // } @@ -869,7 +869,7 @@ xstring ClassifyID = dw_custom.GetItemString(k, L"ClassifyID"); xstring ClassifyName = dw_custom.GetItemString(k, L"CustName"); xstring GroupNo = dw_custom.GetItemString(k, L"GroupNo"); - if (GroupNo != L"") ClassifyName += ClassifyName + L"(L" + GroupNo + L")L"; + if (GroupNo != L"") ClassifyName += ClassifyName + L"(" + GroupNo + L")"; double LegalQty = dw_custom.GetItemDouble(k, L"LegalQty"); @@ -913,7 +913,7 @@ xstring ClassifyID = dw_custom.GetItemString(k, L"ClassifyID"); xstring ClassifyName = dw_custom.GetItemString(k, L"CustName"); xstring GroupNo = dw_custom.GetItemString(k, L"GroupNo"); - if (GroupNo != L"") ClassifyName += ClassifyName + L"(L" + GroupNo + L")L"; + if (GroupNo != L"") ClassifyName += ClassifyName + L"(" + GroupNo + L")"; double VQuantity = dw_custom.GetItemDouble(k, L"Quantity"); double VAmount = dw_custom.GetItemDouble(k, L"Amount"); double qty = 0.0; @@ -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""); @@ -2132,7 +2132,7 @@ if (o.selectSingleNode(L"VATRates")) { xstring str1 = o.selectSingleNode(L"VATRates").text(); - if (str1.find(L",L") >= 0) str1 = str1.left(str1.find(L",L")); + if (str1.find(L",") >= 0) str1 = str1.left(str1.find(L",")); dw_custom.SetItemString(i, L"VATRates", str1); } if (o.selectSingleNode(L"CustEName")) @@ -2185,7 +2185,7 @@ if(o.selectSingleNode(L"VATRates")) { xstring str1 = o.selectSingleNode(L"VATRates").text(); - if(str1.find(L",L")) str1 = str1.left(str1.find(L",L")); + if(str1.find(L",")) str1 = str1.left(str1.find(L",")); dw_custom.SetItemString(i,L"VATRates",str1); } if(o.selectSingleNode(L"CustEName")) @@ -2440,7 +2440,7 @@ if (o.selectSingleNode(L"VATRates")) { xstring str1 = o.selectSingleNode(L"VATRates").text(); - if (str1.find(L",L")) str1 = str1.left(str1.find(L",L")); + if (str1.find(L",")) str1 = str1.left(str1.find(L",")); dw_custom.SetItemString(i, L"VATRates", str1); dw_customex.SetItemString(i, L"VATRates", str1); } @@ -2505,6 +2505,7 @@ arg.AddArg(L"InvoiceNo", dw_base.GetItemString(1, L"InvoiceNo")); int p = arg; OpenWindow(L"dev:xpage[select.item.po.vx]", p); + xstring str = arg.GetArgString(L"items"); if (str != L"") { @@ -2614,7 +2615,7 @@ } else if (SONos.find(SONo) < 0) { - SONos += L",L" + SONo; + SONos += L"," + SONo; costs += cost; } } @@ -2624,7 +2625,7 @@ xstring CustomerPONo = t.selectSingleNode(L"CustomerPONo").text(); if (OrderNos == L"") OrderNos = CustomerPONo; - else if (OrderNos.find(CustomerPONo) < 0) OrderNos += L",L" + CustomerPONo; + else if (OrderNos.find(CustomerPONo) < 0) OrderNos += L"," + CustomerPONo; } if (t.selectSingleNode(L"OperationTips")) @@ -2908,7 +2909,7 @@ } else if (SONo_s.find(SONo) < 0) { - SONo_s += L",L" + SONo; + SONo_s += L"," + SONo; } xstring PONo = dw_item.GetItemString(k, L"PONo"); if (PONo_s == L"") @@ -2917,7 +2918,7 @@ } else if (PONo_s.find(PONo) < 0) { - PONo_s += L",L" + PONo; + PONo_s += L"," + PONo; } } dw_base.SetItemString(1, L"OrderNos", PONo_s); @@ -3678,7 +3679,7 @@ int OnAttachEvent() { //绑定工具条点击事件 - AttachEvent(L"WM_XCOMMAND", L"DWV_CLICKED", (FEvent)&GDN3MaintWin::OnXCommand); + AttachEvent(L"WM_XCOMMAND", (FEvent)&GDN3MaintWin::OnXCommand); //获取焦点事件,用于重置工具条 AttachEvent(L"WM_SETFOCUS", (FEvent)&GDN3MaintWin::OnSetFocus); -- Gitblit v1.9.3