From af73f90f5dbcd379e1be72144f281ca26958b41f Mon Sep 17 00:00:00 2001
From: hongji.li <hongji.a.li@capgemini.com>
Date: 星期三, 25 十月 2023 09:52:50 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj
---
_Main/UI/MacroPlannerWebApp/Component_DialogDataDistribution/Response_pnlActions_btnOk_OnClick.def | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogDataDistribution/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogDataDistribution/Response_pnlActions_btnOk_OnClick.def
index f2e440f..d4696a6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogDataDistribution/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogDataDistribution/Response_pnlActions_btnOk_OnClick.def
@@ -4,21 +4,36 @@
{
#keys: '[414702.1.84941735]'
DefinitionID: 'Responsedef_WebButton_OnClick'
+ Precondition:
+ [*
+ flag := not isnull( GlobalOTDTable ) and not isnull( GlobalOTDLog );
+
+ activeScenario := DataHolderActiveScenario.Data();
+ currentScenario := DataHolderScenario.Data();
+ businessType := ddlBusinessType.Data();
+
+ if ( activeScenario = currentScenario or isnull( businessType ) ) {
+ flag := false;
+ feedback := "鏃犳硶瀵瑰綋鍓嶉�変腑鍦烘櫙杩涜鍒嗗彂";
+ }
+
+ isExists := exists( GlobalOTDLog, DataDistributionLog, tempDD, tempDD.ExecuteStatus() = "Running" and tempDD.MacroPlanMDSID() = currentScenario.DatasetMDSID() );
+ if ( flag and isExists ) {
+ flag := false;
+ feedback := "褰撳墠鍦烘櫙姝ｅ湪杩涜鍒嗗彂";
+ }
+
+ return flag;
+ *]
QuillAction
{
Body:
[*
Form.ApplyChanges();
- businessType := select( GlobalOTDTable,
- BusinessType,
- b,
- b.ScenarioName() = dropDownStringListGeneral.Text()
- );
-
- //Global_BrokerExecuteLog::CreateInOperation( GlobalOTDTable, "DataDistribution", ApplicationMacroPlanner.GetUserName() );
+ DataDistributionLog::Create( GlobalOTDLog, ApplicationMacroPlanner.GetUserName(), DataHolderScenario.Data().DatasetMDSID(), DataHolderScenario.Data().Name() );
MacroPlan::DoASync( DataHolderScenario.Data(),
- businessType.BusinessTypeName(),
+ ddlBusinessType.Data(),
checkboxIsKeyProduct.Checked(),
checkboxCreatePurchaseSupplyProduct.Checked(),
GlobalOTDTable );
--
Gitblit v1.9.3