From 6e054f128e4c71ec9d4e65d8d1acee7606929450 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 25 九月 2024 17:20:02 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/QuoteFile.cpp | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/jrj/project/business/QuoteFile.cpp b/jrj/project/business/QuoteFile.cpp
index 8cc020a..c1a716a 100644
--- a/jrj/project/business/QuoteFile.cpp
+++ b/jrj/project/business/QuoteFile.cpp
@@ -3445,6 +3445,10 @@
//if(makeMessage(L"/task/quote/purchar/backtosaler")==-1) return 1;
return OnSaleBack();
}
+ else if (comdid == L"xmPurch2")
+ {
+ return OnPurch2();
+ }
else if (comdid == L"xmPurch")
{
return OnPurch();
@@ -3554,10 +3558,10 @@
if (action == L"purch")
{
int crow = dw_cell.GetRow();
- xstring cmd = comdid.mid(3, comdid.length());
- if (getRowID(dw_cell, crow) == L"") SendCtrlCmd(dw_cell, cmd);
+ if (getRowID(dw_cell, crow) == L"") SendCtrlCmd(dw_cell, comdid);
return 1;
}
+ return 1;
}
return 0;
}
@@ -3592,6 +3596,19 @@
return 1;
}
+ int OnPurch2()
+ {
+ xaserverarg arg;
+ arg.AddArg(L"EntityID", entityID);
+ OpenWindow(L"dev:xpage[QuoteFilePurch2Select.vx]", arg);
+ xstring taskID = arg.GetArgString(L"TaskID");
+ if (taskID != L"")
+ {
+ ProcessSendMessage(L"/task/quote/repurch", taskID, L"", L"", true);
+ }
+ return 1;
+ }
+
int OnSaveEx(bool balert = false)
{
//dw_cell.AcceptText();
--
Gitblit v1.9.3