From fe56ca545321a285dadafd15f1ed588079b3183b Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 31 十月 2024 09:49:19 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/QuoteFile.cpp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/jrj/project/business/QuoteFile.cpp b/jrj/project/business/QuoteFile.cpp
index db00942..c0fa286 100644
--- a/jrj/project/business/QuoteFile.cpp
+++ b/jrj/project/business/QuoteFile.cpp
@@ -2953,7 +2953,7 @@
trace(L"\r\n----row:" + xstring(row) + L"--col:" + xstring(col));
trace(L"\r\n----row:" + xstring(row) + L"--col:" + xstring(col));
trace(L"\r\n--value:" + dw_cell.GetItemString(row, col) + L"--orig:" + orivalue);
- if (row == ARow && col == ACol && dw_cell.GetItemString(row, col) == orivalue) return 1;
+ //if (row == ARow && col == ACol && dw_cell.GetItemString(row, col) == orivalue) return 1;
trace(L"\r\n--enter:");
ARow = row;
@@ -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