From fb3ecc5c5fb16024f14d494d7f263639551d29b4 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 18 十月 2024 14:52:13 +0800
Subject: [PATCH] update

---
 jrj/project/business/QuoteFile.cpp                   |    3 ++-
 jrj/project/business/Quote/QuoteFilePurch2Select.cpp |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/jrj/project/business/Quote/QuoteFilePurch2Select.cpp b/jrj/project/business/Quote/QuoteFilePurch2Select.cpp
index 608928a..ea80727 100644
--- a/jrj/project/business/Quote/QuoteFilePurch2Select.cpp
+++ b/jrj/project/business/Quote/QuoteFilePurch2Select.cpp
@@ -79,10 +79,10 @@
 		xaserverarg arg;
 		arg.AddArg(L"EntityID", GetEntityID(2),L"xs:string");
 		openUrl(L"/sale/view/workflow.view/xpage/chkdlg_vd", &arg);	//---openUrl("/sale/view/workflow.view/xpage/chkdlg", arg);								
-		string comdid = arg.GetArgString(L"comdid");
+		xstring comdid = arg.GetArgString(L"comdid");
 		if (comdid == L"xmOK")
 		{
-			string value = arg.GetArgString(L"content");
+			xstring value = arg.GetArgString(L"content");
 			if (value == L"")value = L".";
 			return value;
 		}
diff --git a/jrj/project/business/QuoteFile.cpp b/jrj/project/business/QuoteFile.cpp
index db00942..8f048b2 100644
--- a/jrj/project/business/QuoteFile.cpp
+++ b/jrj/project/business/QuoteFile.cpp
@@ -3760,9 +3760,10 @@
 		arg.AddArg(L"EntityID", entityID);
 		OpenWindow(L"dev:xpage[QuoteFilePurch2Select.vx]", arg);
 		xstring taskID = arg.GetArgString(L"TaskID");
+		xstring reason = arg.GetArgString(L"Reason");
 		if (taskID != L"")
 		{
-			ProcessSendMessage(L"/task/quote/repurch", taskID, L"", L"", true);
+			ProcessSendMessage(L"/task/quote/repurch", taskID, reason, L"", true);
 		}
 		return 1;
 	}

--
Gitblit v1.9.3