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 | 6 ++++++
jrj/project/printview/Template.Print.ViewEx.cpp | 6 ++++++
jrj/project/business/VATNotify/simple.maint.vatnotify.cpp | 7 +++++++
jrj/ext-jrj/ext-jrj.vcxproj.user | 4 ++--
4 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.user b/jrj/ext-jrj/ext-jrj.vcxproj.user
index 240bdd3..15d4a23 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.user
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.user
@@ -1,8 +1,8 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <LocalDebuggerCommand>d:\xclient64\xexplorer64.exe</LocalDebuggerCommand>
- <LocalDebuggerWorkingDirectory>d:\xclient64</LocalDebuggerWorkingDirectory>
+ <LocalDebuggerCommand>D:\xclient64\xexplorer64.exe</LocalDebuggerCommand>
+ <LocalDebuggerWorkingDirectory>D:\xclient64</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerCommandArguments>-noupdate</LocalDebuggerCommandArguments>
</PropertyGroup>
diff --git a/jrj/project/business/VATNotify/list.vatnotify.cpp b/jrj/project/business/VATNotify/list.vatnotify.cpp
index ec83227..7ceb6ed 100644
--- a/jrj/project/business/VATNotify/list.vatnotify.cpp
+++ b/jrj/project/business/VATNotify/list.vatnotify.cpp
@@ -97,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;
@@ -106,6 +107,7 @@
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);
@@ -128,10 +130,12 @@
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);
@@ -375,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);
diff --git a/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp b/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp
index dd874a7..a18d51e 100644
--- a/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp
+++ b/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp
@@ -70,9 +70,12 @@
xstring InvoiceNo = dw_item.GetItemString(dw_item.GetRow(), L"NInvoiceNo");
if (InvoiceNo == L"") InvoiceNo = dw_item.GetItemString(dw_item.GetRow(), L"InvoiceNo");
xstring SupplierID = dw_item.GetItemString(dw_item.GetRow(), L"SupplierID");
+ xstring SupplierName = dw_item.GetItemString(dw_item.GetRow(), L"ShortName");
arg.AddArg(L"EntityNo", InvoiceNo, L"");
+ arg.AddArg(L"EntityNoEx", InvoiceNo, L"");
arg.AddArg(L"SupplierID", SupplierID);
arg.AddArg(L"VATNotifyID", L"");
+ arg.AddArg(L"SupplierName", SupplierName);
openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", arg);
return 1;
@@ -87,9 +90,12 @@
xstring InvoiceNo = dw_item.GetItemString(dw_item.GetRow(), L"NInvoiceNo");
if (InvoiceNo == L"") InvoiceNo = dw_item.GetItemString(dw_item.GetRow(), L"InvoiceNo");
xstring SupplierID = dw_item.GetItemString(dw_item.GetRow(), L"SupplierID");
+ xstring SupplierName = dw_item.GetItemString(dw_item.GetRow(), L"ShortName");
arg.AddArg(L"EntityNo", InvoiceNo, L"");
+ arg.AddArg(L"EntityNoEx", InvoiceNo, L"");
arg.AddArg(L"SupplierID", SupplierID);
arg.AddArg(L"VATNotifyID", dw_item.GetGuid(dw_item.GetRow()));
+ arg.AddArg(L"SupplierName", SupplierName);
trace(InvoiceNo + L"====L" + dw_item.GetGuid(dw_item.GetRow()));
openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", arg);
@@ -843,6 +849,7 @@
dw_item.SetColumnState(L"QtyUnitName", false);
dw_item.SetColumnState(L"QtyUnit", false);
dw_item.SetColumnState(L"CQtyUnit", false);
+ dw_item.SetColumnState(L"ShortName", false);
dw_fob = GetControl(L"dw_fob");
dw_fob.openUrl(L"/sale/view/VATNotify/template/VATNotify/fob");
diff --git a/jrj/project/printview/Template.Print.ViewEx.cpp b/jrj/project/printview/Template.Print.ViewEx.cpp
index 05da9f3..3f1ec4a 100644
--- a/jrj/project/printview/Template.Print.ViewEx.cpp
+++ b/jrj/project/printview/Template.Print.ViewEx.cpp
@@ -48,6 +48,7 @@
public:
xhtml ole_print;
xcell cell;
+ xstring m_SupplierName;
xstring m_EntityName;
xstring m_EntityID;
xstring m_EntityNo;
@@ -137,6 +138,7 @@
if(m_EntityName==L"SaleOrder") pre=L"PI";
if(m_EntityName==L"GDN3")pre=L"INV";
}
+ if (m_EntityName == L"VATNotify")m_EntityNo = m_EntityNo + m_SupplierName;
xstring file1 = GetMySaveFileName(pre+m_EntityNo+L".xlsx",
L"Excel1文件(*.xlsx)\0*.xlsx;*.xls\0Excel97文件(*.xls)\0*.xls\0PDF文件(*.pdf)\0*.pdf\0",
L"xlsx");
@@ -685,6 +687,7 @@
m_EntityID = arg.GetArgString(L"EntityID");
m_EntityNo = arg.GetArgString(L"EntityNo");
m_EntityName = arg.GetArgString(L"EntityName");
+ m_SupplierName = arg.GetArgString(L"SupplierName");
m_DocumentID = L"";
OnHtml(arg);
@@ -762,6 +765,7 @@
m_EntityID = arg.GetArgString(L"EntityID");
m_EntityNo = arg.GetArgString(L"EntityNo");
m_EntityName = arg.GetArgString(L"EntityName");
+ m_SupplierName = arg.GetArgString(L"SupplierName");
m_DocumentID = L"";
OnHtml(arg);
}
@@ -991,6 +995,7 @@
m_EntityID = arg.GetArgString(L"EntityID");
m_EntityNo = arg.GetArgString(L"EntityNo");
m_EntityName = arg.GetArgString(L"EntityName");
+ m_SupplierName = arg.GetArgString(L"SupplierName");
m_DocumentID = L"";
return 1;
}
@@ -1192,6 +1197,7 @@
m_EntityID = arg.GetArgString(L"EntityID");
m_EntityNo = arg.GetArgString(L"EntityNo");
m_EntityName = arg.GetArgString(L"EntityName");
+ m_SupplierName = arg.GetArgString(L"SupplierName");
m_DocumentID = L"";
}
}else
--
Gitblit v1.9.3