From 597f8e8f284b7494fceabaeb2c96e4496cfd2435 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期二, 18 六月 2024 17:31:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

---
 _Main/BL/Type_Routing/StaticMethod_ThermalTrialRatio.qbl |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/_Main/BL/Type_Routing/StaticMethod_ThermalTrialRatio.qbl b/_Main/BL/Type_Routing/StaticMethod_ThermalTrialRatio.qbl
index 54256b2..63d74ca 100644
--- a/_Main/BL/Type_Routing/StaticMethod_ThermalTrialRatio.qbl
+++ b/_Main/BL/Type_Routing/StaticMethod_ThermalTrialRatio.qbl
@@ -2,6 +2,7 @@
 #parent: #root
 StaticMethod ThermalTrialRatio (
   Routing routing,
+  Unit unit,
   Number capacity,
   Date start,
   Date end,
@@ -12,10 +13,24 @@
   TextBody:
   [*
     // Adhi Feb-10-2016 (created)
-    thermaltrial := '鐑紡';
+    thermaltrial := Unit::GetThermalTrial();
     newroutings := construct( Routings );
-    unit := selectobject( routing.MacroPlan(), Unit, unit, unit.ID() = thermaltrial and unit.HasCapacityTypeQuantity() );
+    
+    for( starttime := start; starttime <= end; starttime := starttime + 1 ){
+      uc := selectobject( unit, UnitCapacity, uc, uc.Start().Date() = starttime );
+      if( isnull( uc ) ){
+        uc := UnitCapacity::Create( unit, starttime.DateTime(), 'Day', 0.0, [Real]capacity, 100.0, 1, false );
+      }
+      uc.MaxCapacity( [Real]capacity * ratio );
+    }
+    
     newrouting := routing.Copy();
+    name := newrouting.Name().ReplaceAll( 'Copy', thermaltrial );
+    newrouting.Name( name );
+    newrouting.UpdateTypeIndex( name );
+    routing.Start( start );
+    routing.End( end );
+    
     routingstep := newrouting.LastStep();
     //info( '------------------', routingstep.Tool(), ',', unit.ID() );
     newroutingstep := RoutingStep::Create( newrouting, thermaltrial, routingstep.Tool(), false );

--
Gitblit v1.9.3