From 448b56364d4bd9c990ee190e1aafd8188edf25a0 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 28 六月 2024 10:46:25 +0800
Subject: [PATCH] update quote enquiry
---
jrj/project/business/HR/AdministrativeDepartmentFolder.cpp | 4 +++-
jrj/project/business/SO/maint.Document.SO3.v3.cpp | 2 +-
jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp | 4 ++--
jrj/project/business/SO3.list.cpp | 8 ++++----
jrj/ext-jrj/ext-jrj.vcxproj | 2 +-
5 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index b714f50..7bd7902 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -273,7 +273,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Public\memo.edit.new.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\quote.enquiry.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
diff --git a/jrj/project/business/HR/AdministrativeDepartmentFolder.cpp b/jrj/project/business/HR/AdministrativeDepartmentFolder.cpp
index 31ca6fa..be01a84 100644
--- a/jrj/project/business/HR/AdministrativeDepartmentFolder.cpp
+++ b/jrj/project/business/HR/AdministrativeDepartmentFolder.cpp
@@ -181,7 +181,9 @@
adid = L"";
parentid = L"";
- if (GetWinParam()) {
+ if (GetWinParam())
+ {
+ xaserverarg arg=GetArg();
parentid = arg.GetArgString(L"parentid");
adid = arg.GetArgString(L"adid");
}
diff --git a/jrj/project/business/SO/maint.Document.SO3.v3.cpp b/jrj/project/business/SO/maint.Document.SO3.v3.cpp
index e35dd11..321df57 100644
--- a/jrj/project/business/SO/maint.Document.SO3.v3.cpp
+++ b/jrj/project/business/SO/maint.Document.SO3.v3.cpp
@@ -454,7 +454,7 @@
if (GetWinParam())
{
- xaserverarg arg;
+ xaserverarg arg= GetArg();
entityid = arg.GetArgString(L"entityid");
Type = arg.GetArgString(L"Type");
ApprovalStatus = arg.GetArgString(L"ApprovalStatus");
diff --git a/jrj/project/business/SO3.list.cpp b/jrj/project/business/SO3.list.cpp
index 6056ff2..c75d8cc 100644
--- a/jrj/project/business/SO3.list.cpp
+++ b/jrj/project/business/SO3.list.cpp
@@ -285,12 +285,12 @@
return 1;
}
- int PreOnCmdDispatch(string comdid)
+ int PreOnCmdDispatch(xstring comdid)
{
if (comdid == L"action:bill.new")
{
- string s = publiccode::GetUser().id;
- string no = publiccode::GetUser().no;
+ xstring s = publiccode::GetUser().id;
+ xstring no = publiccode::GetUser().no;
if (no != L"00303" && no != L"admin")
{
KXMLDOMDocument supplier_x = ViewObject::RetrieveData(GetServerUrl(),L"/sale/data/SupplierV3/entity/FindBySaleType", L"id", s);
@@ -306,7 +306,7 @@
}
if (comdid == L"action:bill.annex")
{
- string deptname = publiccode::GetUser().deptname;
+ xstring deptname = publiccode::GetUser().deptname;
if (deptname == L"采购部")
{
return 1;
diff --git a/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
index 72246ac..7d3007d 100644
--- a/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
@@ -406,13 +406,13 @@
return 1;
}
- virtual int PreOnCmdDispatch(string comdid)
+ virtual int PreOnCmdDispatch(xstring comdid)
{
//返回0——不在执行以下代码；返回其他——执行以下代码。
return 1;
}
- virtual int PostOnCmdDispatch(string comdid)
+ virtual int PostOnCmdDispatch(xstring comdid)
{
// trace("test");
return 1;
--
Gitblit v1.9.3