From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 22 一月 2025 12:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def
index 013d36c..57fd815 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def
@@ -1,6 +1,6 @@
Quintiq file version 2.0
#parent: #root
-Method OnOK () id:Method_DialogCreateEditThermalTrialRatio_OnOK
+Method OnOK () id:Method_DialogCreateEditHotTestRatio_OnOK
{
#keys: '[415136.0.762562093]'
Body:
@@ -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, ddlUnit.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