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/printview/Template.Print.ViewEx.cpp | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/jrj/project/printview/Template.Print.ViewEx.cpp b/jrj/project/printview/Template.Print.ViewEx.cpp
index 2c1e1ab..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");
@@ -419,7 +421,6 @@
xstring DownLoadPaperPic(xstring guid)
{
-
xstring path = xutil::GetModuleTmpPath();
xstring ext = L"jpg";
xstring filename = guid + L"." + ext;
@@ -510,15 +511,15 @@
xstring skuno = tail.mid(spos,pos1 - spos ).trim();
xstring CustomerID=L"";
xstring CustomerItemNo=L"";
- if(skuno.find(L",L")>0)
+ if(skuno.find(L",")>0)
{
- CustomerID = skuno.left(skuno.find(L",L")).trim();
- skuno = skuno.mid(skuno.find(L",L")+1,256).trim();
+ CustomerID = skuno.left(skuno.find(L",")).trim();
+ skuno = skuno.mid(skuno.find(L",")+1,256).trim();
}
- if(skuno.find(L",L")>0)
+ if(skuno.find(L",")>0)
{
- CustomerItemNo = skuno.left(skuno.find(L",L")).trim();
- skuno = skuno.mid(skuno.find(L",L")+1,256).trim();
+ CustomerItemNo = skuno.left(skuno.find(L",")).trim();
+ skuno = skuno.mid(skuno.find(L",")+1,256).trim();
}
xstring src = DownLoadSKUNoPic(skuno,CustomerID,CustomerItemNo);
head += tail.left(pos) + L"src=\"" + src;
@@ -686,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);
@@ -763,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);
}
@@ -992,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;
}
@@ -1193,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