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.Dialog.cpp | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/jrj/project/printview/Template.Print.Dialog.cpp b/jrj/project/printview/Template.Print.Dialog.cpp
index 51aa67d..6d5f4ee 100644
--- a/jrj/project/printview/Template.Print.Dialog.cpp
+++ b/jrj/project/printview/Template.Print.Dialog.cpp
@@ -4,7 +4,6 @@
#include <xcontrol/xlayersheet.hpp>
#include "vbusiness/vframe/maint.vframe.vbusiness.hpp"
-#include "vbusiness/vframe/maint.vframe.vbusiness.hpp"
#include "vbusiness/vframe/responsewin.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
@@ -81,8 +80,14 @@
KXMLDOMElement ele = dw_list.GetRowElement(row);
xstring sguid = ele.selectSingleNode(L"ID").text();
xstring sTemplName = ele.selectSingleNode(L"TemplName").text();
- //xstring sFile = m_filePath + sguid+L".xsl";
- xstring sFile = m_filePath + ele.selectSingleNode(L"urlPath").text();
+ //xstring sFile = m_filePath + sguid+L".xsl";
+ xstring sFile = ele.selectSingleNode(L"urlPath").text();
+ if (sFile.left(1) == L"/")
+ {
+ sFile = L"/business/rpttemplate" + sFile;
+ }else
+ sFile = m_filePath + sFile;
+
arg_param.AddArg(L"xsl", sFile);
arg_param.AddArg(L"return", L"cancel");
@@ -106,7 +111,11 @@
}
xstring sguid = publiccode::GetGuid();
xstring sname = sguid + L".xsl";
- xstring suri = L"rpttemplate\\" + m_EntityName; //rpttemplate\SO
+ xstring entityName = m_EntityName;
+ xstring entitys = L",CD,GDN3,PO,PurchaseOrder,Quote,Quote1,SaleOrder,VATNotify,";
+ if(entitys.find(entityName) < 0)
+ entityName = L"SaleOrder";
+ xstring suri = L"rpttemplate\\" + entityName; //rpttemplate\SO
//suri = L"supplier00";
xstring ret = xaserver::UploadFile(suri, sname, GetHWND(), L"", false);
if (ret == L"-1")
@@ -122,6 +131,11 @@
args.AddArg(L"sEntity", m_EntityName);
args.AddArg(L"sDir", m_Dir);
args.AddArg(L"urlPath", sname);
+ if (entityName != m_EntityName)
+ args.AddArg(L"urlPath", L"/SaleOrder/" + sname);
+ else
+ args.AddArg(L"urlPath", sname);
+
//alert(m_Dir);
while (ret.find(L"\\", 0) >= 0)
ret = ret.mid(ret.find(L"\\", 0) + 1, 9999);
@@ -225,7 +239,14 @@
xstring sTemplName = ele.selectSingleNode(L"TemplName").text();
//xstring sFile = m_filePath + sguid+L".xsl";
trace(sTemplName);
- xstring sFile = m_filePath + ele.selectSingleNode(L"urlPath").text();
+ xstring sFile = ele.selectSingleNode(L"urlPath").text();
+ if (sFile.left(1) == L"/")
+ {
+ sFile = L"/business/rpttemplate" + sFile;
+ }
+ else
+ sFile = m_filePath + sFile;
+
arg_param.AddArg(L"xsl", sFile);
arg_param.AddArg(L"return", L"ok");
arg_param.AddArg(L"template-name", sTemplName);
@@ -393,7 +414,7 @@
int nlen = nlist.length();
xstring toolStr = L"<vbox name='Dir'>";
xstring deptName = publiccode::GetUser().deptname;
- if (deptName == L"跟单部" && m_EntityName == L"GDN3") {
+ if (deptName == L"订单操作部" && m_EntityName == L"GDN3") {
for (i = 2; i < nlen; i++)
{
KXMLDOMElement e1 = nlist.item(i);
@@ -491,7 +512,7 @@
}
else
{
- arg_param.setNativePointer(arg_param.CreateInstance());
+
m_EntityName = L"SO";
m_EntityID = L"00000000-0000-0000-0000-000000000000";
}
--
Gitblit v1.9.3