From cf8dba7748cc9826d744069b5063a14e3fcd2fa8 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 13 三月 2025 10:48:17 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/printview/Template.Print.Dialog.cpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/jrj/project/printview/Template.Print.Dialog.cpp b/jrj/project/printview/Template.Print.Dialog.cpp
index 7b58fbd..8f00230 100644
--- a/jrj/project/printview/Template.Print.Dialog.cpp
+++ b/jrj/project/printview/Template.Print.Dialog.cpp
@@ -375,7 +375,7 @@
xml x;
xaserverarg arg;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"EntityName", m_EntityName, L"");
arg.AddArg(L"EntityID", m_EntityID, L"");
arg.AddArg(L"susername", susername, L""); //
@@ -393,7 +393,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 +491,7 @@
}
else
{
- arg_param.setNativePointer(arg_param.CreateInstance());
+
m_EntityName = L"SO";
m_EntityID = L"00000000-0000-0000-0000-000000000000";
}
--
Gitblit v1.9.3