From 42e52dd7a48775cd83be92cc46ea42aa124cb15c Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 14 六月 2024 13:06:19 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def | 18 ++++++------------
1 files changed, 6 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..6abc3b1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def
@@ -12,18 +12,12 @@
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() );
+ info( '------------web---------------' );
+ traverse( newroutings, Elements, e ){
+ info( e.Key(), e.Name() );
+ }
+ ApplicationMacroPlanner.SelectListObjects( dhForm.Data().ListRoutings(), newroutings );
this.Close();
*]
--
Gitblit v1.9.3