From 4f426fd0938d68df759fff7570ad6ec2e62bac96 Mon Sep 17 00:00:00 2001
From: renhao <renhui.hao@capgemini.com>
Date: 星期三, 18 十月 2023 09:08:32 +0800
Subject: [PATCH] Merge branch 'dev'
---
_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Method_ClickBtnOk.def | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Method_ClickBtnOk.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Method_ClickBtnOk.def
index 6519f81..f696a84 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Method_ClickBtnOk.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Method_ClickBtnOk.def
@@ -7,15 +7,15 @@
[*
// Disabled button to prevent the possibility of multiple firing
- btnOk.Enabled(false,'');
+ //btnOk.Enabled(false,'');
// OnOk
this.ApplyChanges();
- DataHolderFilling.Data().Commit();
+ //DataHolderFilling.Data().Commit();
- fillingData := DataHolderFilling.Data();
+ //fillingData := DataHolderFilling.Data();
- CustomerAndForecastOrder::CreateFillingCapacityOrder( MacroPlan, fillingData.WrappedInstance());
+ //CustomerAndForecastOrder::CreateFillingCapacityOrder( MacroPlan, fillingData.WrappedInstance());
//if( not isnull( DataHolderForm.Data() ) )
//{
@@ -23,6 +23,15 @@
// DataHolderForm.Data().ListAssumptions().SelectByKey( DataHolderDialogData.Data().WrappedInstance().Key() );
//}
+ FillingCapacityOrder::CreateFillingCapacityOrder( MacroPlan,
+ DataHolderFilling.Data().OrderID(),
+ [Real]edtSalesAmount.Text(),
+ dsDemandDate.Date(),
+ dsForecastDemandDate.Date(),
+ ddslOrderType.Text(),
+ DataHolderFilling.Data().VerNo()
+ );
+
this.Close();
*]
}
--
Gitblit v1.9.3