From 9b3b2eb20b09e13da837a28f16e552ba70a090c4 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期四, 24 四月 2025 14:48:21 +0800
Subject: [PATCH] update
---
jrj/project/business/VATNotify/list.vatnotify.cpp | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/jrj/project/business/VATNotify/list.vatnotify.cpp b/jrj/project/business/VATNotify/list.vatnotify.cpp
index 4ea5cfd..7ceb6ed 100644
--- a/jrj/project/business/VATNotify/list.vatnotify.cpp
+++ b/jrj/project/business/VATNotify/list.vatnotify.cpp
@@ -69,8 +69,7 @@
xaserverarg arg;
if (colname == L"SONo")
{
- xstring SONo = dw_list.GetItemString(row, colname);
- ;
+ xstring SONo = dw_list.GetItemString(row, colname.c_str());
arg.AddArg(L"EntityNo", SONo);
arg.AddArg(L"ReadOnly", L"true");
@@ -78,8 +77,7 @@
}
if (colname == L"InvoiceNo")
{
- xstring InvoiceNo = dw_list.GetItemString(row, colname);
- ;
+ 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"");
@@ -99,6 +97,7 @@
xstring NInvoiceNoEx = dw_list.GetItemString(dw_list.GetRow(), L"NInvoiceNo");
xstring InvoiceNoEx = dw_list.GetItemString(dw_list.GetRow(), L"InvoiceNo");
+ xstring SupplierName = dw_list.GetItemString(dw_list.GetRow(), L"ShortName");
if (NInvoiceNoEx != InvoiceNoEx)
{
NInvoiceNoEx = InvoiceNoEx;
@@ -108,15 +107,16 @@
arg.AddArg(L"EntityNoEx", NInvoiceNoEx, L"");
arg.AddArg(L"SupplierID", SupplierID);
arg.AddArg(L"VATNotifyID", L"");
+ arg.AddArg(L"SupplierName", SupplierName);
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"");
@@ -130,13 +130,15 @@
NInvoiceNoEx = InvoiceNoEx;
}
xstring SupplierID = dw_list.GetItemString(dw_list.GetRow(), L"SupplierID");
+ xstring SupplierName = dw_list.GetItemString(dw_list.GetRow(), L"ShortName");
arg.AddArg(L"EntityNo", InvoiceNo, L"");
arg.AddArg(L"EntityNoEx", NInvoiceNoEx, L"");
arg.AddArg(L"SupplierID", SupplierID);
arg.AddArg(L"VATNotifyID", dw_list.GetGuid(dw_list.GetRow()));
+ arg.AddArg(L"SupplierName", SupplierName);
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;
}
@@ -239,7 +241,7 @@
}
else if (comdid == L"find")
{
- m_QueryTxt = GetControl(L"txt").GetText();
+ m_QueryTxt = xcontrol(GetControl(L"txt")).GetText();
return OnRetrieve(DatePicker);
}
else if (comdid == L"xmRefresh")
@@ -286,10 +288,10 @@
DWNMHDR& hdr = *(DWNMHDR*)evt->notify.pnmh;
- int h = xcombobox::GetCurSel(evt.hCtrl);
+ int h = xcombobox::GetCurSel(evt->command.hCtrl);
if (h > -1)
{
- xstring txt = xcombobox::GetLBText(evt.hCtrl, h);
+ xstring txt = (string)xcombobox::GetLBText(evt->command.hCtrl, h);
if (txt == L"通知日期")
{
@@ -338,7 +340,7 @@
{
//trace(x.xml);
KXMLDOMElement ele = x.documentElement();
- if (dw_pages.ptr_native_)
+ if (dw_pages.getNativePointer())
{
if (ele.selectSingleNode(L"@TotalPage"))
{
@@ -377,6 +379,8 @@
{
dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"/sale/view/VATNotify/template/VATNotify/list");
+ dw_list.SetColumnState(L"ShortName", false);
+
dw_arg = GetControl(L"dw_arg");
dw_arg.openUrl(L"/sale/view/AR/template/queryarg");
dw_arg.SetColHeaderHeight(0);
--
Gitblit v1.9.3