From 71f0716aa67f6e4f0de2770fe6aba1aa6592999d Mon Sep 17 00:00:00 2001
From: lifan <2308045698@qq.com>
Date: 星期三, 05 八月 2026 15:24:26 +0800
Subject: [PATCH] update

---
 jrj/project/business/VATNotify/simple.maint.vatnotify.cpp |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp b/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp
index 2f46136..4e3677f 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);
@@ -591,6 +597,16 @@
 				dw_item.SetItemString(row1, L"CQuantity", arg.GetArgString(L"CustQuantity"));
 				dw_item.SetItemString(row1, L"ClassifyID", dw_item.GetItemString(row, L"ClassifyID"));
 				dw_item.SetItemDisplayString(row1, L"ClassifyID", dw_item.GetItemDisplayString(row, L"ClassifyID"));
+
+				dw_item.SetItemString(row1, L"Invoiceno", dw_item.GetItemString(row, L"Invoiceno"));
+				dw_item.SetItemString(row1, L"NName", dw_item.GetItemString(row, L"NName"));
+				dw_item.SetItemString(row1, L"CName", dw_item.GetItemString(row, L"CName"));
+				dw_item.SetItemString(row1, L"CQtyUnit", dw_item.GetItemString(row, L"CQtyUnit"));
+				
+				dw_item.SetItemString(row1, L"CreatorID", dw_item.GetItemString(row, L"CreatorID"));
+				dw_item.SetItemDisplayString(row1, L"CreatorID", dw_item.GetItemDisplayString(row, L"CreatorID"));
+				dw_item.SetItemString(row1, L"CreateDate", dw_item.GetItemString(row, L"CreateDate"));
+
 			}
 			return 1;
 		}
@@ -821,7 +837,7 @@
 			if (x == L"userInvoiceNo") //下拉
 			{
 				xstring sInvoiceNo = dw_item.GetItemString(row, L"NInvoiceNo");
-				hdr.data = sInvoiceNo;
+				hdr.data = sInvoiceNo.c_str(true);
 			}
 
 			return 1;
@@ -843,6 +859,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");

--
Gitblit v1.9.3