From 9786b6898c79f5de9ca7eeb168fe4b6f5b0d173f Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 06 九月 2024 13:52:39 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/VATNotify/list.vatinvoice.cpp | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/jrj/project/business/VATNotify/list.vatinvoice.cpp b/jrj/project/business/VATNotify/list.vatinvoice.cpp
index 2051d98..7f299f7 100644
--- a/jrj/project/business/VATNotify/list.vatinvoice.cpp
+++ b/jrj/project/business/VATNotify/list.vatinvoice.cpp
@@ -52,12 +52,12 @@
return 1;
}
- xstring GetEntityName(int pr)
+ xstring GetEntityName(LPARAM pr)
{
return L"VATInvoice3";
}
- xstring GetEntityIDName(int /*param*/ pr)
+ xstring GetEntityIDName(LPARAM /*param*/ pr)
{
return L"VTAInvoiceID";
}
@@ -98,7 +98,7 @@
int h = xcombobox::GetCurSel(evt->command.hCtrl);
if(h > -1)
{
- xstring txt = xcombobox::GetLBText(evt->command.hCtrl, h);
+ xstring txt = (string)xcombobox::GetLBText(evt->command.hCtrl, h);
if(txt==L"增值税票")
{
dw_list.openUrl(L"/sale/view/VATNotify/template/VATInvoice/list");
@@ -140,7 +140,9 @@
if(xcontrol(GetControl(L"cbx_type")).GetText() ==L"未开增值税票" ) return 1;
int row = dw_list.GetRow();
xaserverarg arg;
- xstring VatInvoiceID = dw_list.GetItemString(row,L"VATInvoiceID");
+ xstring VATInvoiceID = dw_list.GetItemString(row,L"VATInvoiceID");
+ arg.AddArg(L"VATInvoiceID", VATInvoiceID);
+
OpenWindow(L"dev:xpage[maint.vatinvoice.vx]", arg);
return 1;
}
@@ -201,7 +203,7 @@
int h = xcombobox::GetCurSel(evt->command.hCtrl);
if(h > -1)
{
- xstring txt = xcombobox::GetLBText(evt->command.hCtrl, h);
+ xstring txt = (string)xcombobox::GetLBText(evt->command.hCtrl, h);
if(txt==L"出运日期")
{
@@ -281,7 +283,7 @@
xml x ;
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"QueryTxt",xcontrol(GetControl(L"sle_search")).GetText());
arg.AddArg(L"QueryArg",GetQueryArg());
arg.AddArg(L"DatePicker",DatePicker);
--
Gitblit v1.9.3