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/VATNotify/update.vatnotify.cpp | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/jrj/project/business/VATNotify/update.vatnotify.cpp b/jrj/project/business/VATNotify/update.vatnotify.cpp
index c7d5e60..709e11f 100644
--- a/jrj/project/business/VATNotify/update.vatnotify.cpp
+++ b/jrj/project/business/VATNotify/update.vatnotify.cpp
@@ -13,6 +13,7 @@
xdwgrid dw_item;
xdwgrid dw_goods;
xnode m_agentNode; //Agent Condition
+ xstring InvNo;
public:
UpdateVatNotifyWin(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {}
@@ -57,7 +58,7 @@
dw_list.AcceptText();
dw_list.DwUpdateAllToEx(x);
- xaserverarg arg = ViewObject::MakeArg();
+ xaserverarg arg;
arg.AddArg(L"content", x.xml());
trace(x.xml());
@@ -246,7 +247,7 @@
//获取焦点事件，用于重置工具条
AttachEvent(L"WM_SETFOCUS", (FEvent)&UpdateVatNotifyWin::OnSetFocus);
AttachEvent(L"dw_item", L"DWV_ROWFOCUSCHANGED", (FEvent)&UpdateVatNotifyWin::OnRowChanged);
-
+ return 1;
}
int RetrieveCustomSource(xstring classifyID, xstring supplierID)
@@ -257,11 +258,11 @@
if (GetWinParam())
{
- int pArg = GetArg();
-
+ arg = GetArg();
+ InvNo = arg.GetArgString(L"invoiceno");
}
else
- arg.AddArg(L"invoiceno", L"15HDLD0720");
+ arg.AddArg(L"invoiceno", InvNo);
arg.AddArg(L"ClassifyID", classifyID);
arg.AddArg(L"SupplierID", supplierID);
@@ -300,11 +301,11 @@
if (GetWinParam())
{
- int pArg = GetArg();
-
+ arg = GetArg();
+ InvNo = arg.GetArgString(L"invoiceno");
}
else
- arg.AddArg(L"invoiceno", L"15HDLD0720");
+ arg.AddArg(L"invoiceno", InvNo);
if (getUrl(L"/sale/data/VATNotify/entity/base/miss", arg.GetString(), x) != 1)
{
trace(x.text());
@@ -343,6 +344,7 @@
int onload()
{
+ SetArg();
dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"/sale/view/VATNotify/template/VATNotify/item");
dw_item = GetControl(L"dw_item");
--
Gitblit v1.9.3