From cf8dba7748cc9826d744069b5063a14e3fcd2fa8 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 13 三月 2025 10:48:17 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/VATNotify/list.vatnotify.cpp | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/jrj/project/business/VATNotify/list.vatnotify.cpp b/jrj/project/business/VATNotify/list.vatnotify.cpp
index 418ef5b..ec83227 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"");
@@ -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;
}
@@ -239,7 +237,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")
@@ -278,6 +276,7 @@
AttachEvent(L"WM_SETFOCUS", (FEvent)&listvatnotifyWin::OnSetFocus);
AttachEvent(L"dw_list", L"DWV_CLICKED", (FEvent)&listvatnotifyWin::OnDWClick);
AttachEvent(L"cbx_state", L"CBN_SELCHANGE", (FEvent)&listvatnotifyWin::OnDatePicker);
+ return 1;
}
int OnDatePicker(TEvent* evt, int lParam)
@@ -285,10 +284,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"通知日期")
{
@@ -337,7 +336,7 @@
{
//trace(x.xml);
KXMLDOMElement ele = x.documentElement();
- if (dw_pages.ptr_native_)
+ if (dw_pages.getNativePointer())
{
if (ele.selectSingleNode(L"@TotalPage"))
{
--
Gitblit v1.9.3