From 4e06e34c0a39cf7e45caca4fbc282bcffd31f30a Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 22 七月 2024 23:25:52 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/VATNotify/simple.maint.vatnotify.cpp | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp b/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp
index 21fb64f..cac6ab8 100644
--- a/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp
+++ b/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp
@@ -369,7 +369,7 @@
{
xml x ;
- xaserverarg arg = ViewObject::MakeArg();
+ xaserverarg arg ;
arg.AddArg(L"ClassifyID", ClassifyID);
arg.AddArg(L"InvoiceNo", InvoiceNo);
arg.AddArg(L"InvoiceExcept", InvoiceNoExcept);
@@ -390,7 +390,7 @@
{
xml x ;
- xaserverarg arg = ViewObject::MakeArg();
+ xaserverarg arg ;
arg.AddArg(L"ClassifyID", ClassifyID);
arg.AddArg(L"InvoiceNo", InvoiceNo);
arg.AddArg(L"InvoiceExcept", InvoiceNoExcept);
@@ -607,7 +607,7 @@
dw_item.AcceptText();
dw_item.DwUpdateAllToEx(x);
- xaserverarg arg = ViewObject::MakeArg();
+ xaserverarg arg ;
arg.AddArg(L"content", x.xml());
@@ -685,6 +685,7 @@
AttachEvent(L"dw_item", L"DWV_ROWFOCUSCHANGED", (FEvent)&simplemaintvatnotifyWin::OnRowChanged);
AttachEvent(L"dw_item", L"DWV_ASKDATA", (FEvent)&simplemaintvatnotifyWin::OnAskDataItem);
AttachCloseWindow();
+ return 1;
}
int RetrieveFob(xstring InvoiceNo, bool start = false)
@@ -729,10 +730,9 @@
{
KXMLDOMElement e = lst.item(i);
docElement.appendChild(e);
- e.Release();
+
}
- docElement.Release();
- lst.Release();
+
dw_fob.Retrieve(x1);
}
else
@@ -778,7 +778,7 @@
if (GetWinParam())
{
- int pArg = GetArg();
+ arg = GetArg();
}
else
@@ -829,6 +829,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);
@@ -859,7 +860,7 @@
if (GetWinParam())
{
- int pArg = GetArg();
+ arg = GetArg();
InvNo = arg.GetArgString(L"invoiceno");
SetWindowText(GetHWND(), InvNo);
--
Gitblit v1.9.3