From 57d0d2d7a076951b3497c635232f773ebedbfa58 Mon Sep 17 00:00:00 2001 From: hongji.li <hongji.a.li@capgemini.com> Date: 星期四, 13 六月 2024 15:08:12 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev --- _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def index 013d36c..352eda7 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def @@ -12,18 +12,9 @@ data := dhDialogData.Data(); - //if( isnull( data.WrappedInstance() ) ) // New - //{ - // // When create product, parent relation must be null (as server method has logic to detect parent change using this relation) - // data.Parent( relflush ); - // data.Commit(); - // dhForm.Data().ListEventType().SelectByKey( data.WrappedInstance().Key() ); - //} - //else - //{ - // LibCal_EventType::Update( dhDialogData.Data().WrappedInstance(), efID.Text(), efName.Text() - // ,guard( selParent.Data(), null( LibCal_EventType ) ) ); - //} + newroutings := Routing::ThermalTrialRatio( data, [Number]efMaxCapacity.Text(), dsStartTime.Date(), dsEndTime.Date(), [Number]efThermalTrialRatio.Text() ); + + ApplicationMacroPlanner.SelectListObjects( dhForm.Data().ListRoutings(), newroutings ); this.Close(); *] -- Gitblit v1.9.3