From 7a8fd5ab0aad4a41a8898b7084b1bceb9a2a8a51 Mon Sep 17 00:00:00 2001
From: renhao <renhui.hao@capgemini.com>
Date: 星期二, 24 十月 2023 16:07:29 +0800
Subject: [PATCH] Merge branch 'dev'
---
_Main/UI/MacroPlannerWebApp/Component_DialogDataDistribution/Response_pnlActions_btnOk_OnClick.def | 11 +++--------
1 files changed, 3 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 fcba155..d4696a6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogDataDistribution/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogDataDistribution/Response_pnlActions_btnOk_OnClick.def
@@ -10,8 +10,9 @@
activeScenario := DataHolderActiveScenario.Data();
currentScenario := DataHolderScenario.Data();
+ businessType := ddlBusinessType.Data();
- if ( activeScenario = currentScenario ) {
+ if ( activeScenario = currentScenario or isnull( businessType ) ) {
flag := false;
feedback := "鏃犳硶瀵瑰綋鍓嶉�変腑鍦烘櫙杩涜鍒嗗彂";
}
@@ -30,15 +31,9 @@
[*
Form.ApplyChanges();
- businessType := select( GlobalOTDTable,
- BusinessType,
- b,
- b.ScenarioName() = dropDownStringListGeneral.Text()
- );
-
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