From acc693e6caf0b4888c4006a4b539cf550476a854 Mon Sep 17 00:00:00 2001 From: xj qian <qianxj15@sina.com> Date: 星期四, 24 四月 2025 14:52:02 +0800 Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj --- jrj/project/printview/Template.Print.ViewEx.cpp | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) 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