From 209134d4060d211fa83b2f24bb4a04ca7fa5badd Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 14 八月 2024 16:23:33 +0800
Subject: [PATCH] 热试比例设置时间设置bug
---
_Main/BL/Type_Routing/StaticMethod_ThermalTrialRatio.qbl | 12 +++++++-----
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Response_pnlActions_btnOk_OnClick.def | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/_Main/BL/Type_Routing/StaticMethod_ThermalTrialRatio.qbl b/_Main/BL/Type_Routing/StaticMethod_ThermalTrialRatio.qbl
index 63d74ca..53e032b 100644
--- a/_Main/BL/Type_Routing/StaticMethod_ThermalTrialRatio.qbl
+++ b/_Main/BL/Type_Routing/StaticMethod_ThermalTrialRatio.qbl
@@ -28,17 +28,19 @@
name := newrouting.Name().ReplaceAll( 'Copy', thermaltrial );
newrouting.Name( name );
newrouting.UpdateTypeIndex( name );
- routing.Start( start );
- routing.End( end );
+
+ newrouting.Start( start );
+ newrouting.End( end );
routingstep := newrouting.LastStep();
- //info( '------------------', routingstep.Tool(), ',', unit.ID() );
- newroutingstep := RoutingStep::Create( newrouting, thermaltrial, routingstep.Tool(), false );
+ newroutingstep := RoutingStep::Create( newrouting, thermaltrial, routingstep.Tool(), false );
+ spname := ifexpr( unit.ID().EndsWith( '鎵归噺鐑瘯' ), unit.ID().ReplaceAll( '鎵归噺鐑瘯', '-' + thermaltrial ), unit.ID().ReplaceAll( '鐑瘯', '-' + thermaltrial ) );
+ info( '------------------', routingstep.Tool(), ',', unit.ID(), ',', spname );
traverse( routingstep, Operation, operation ){
id := Operation::GetConcatenatedID( newrouting.ID(), newroutingstep.Name(), unit.ID() );
// info( '------------------', operation.Name(), routingstep.Name(), newroutingstep.Name() );
- stockingpoint := StockingPoint_MP::FindCreateUpdate( routing.MacroPlan(), thermaltrial, unit, newrouting, true );
+ stockingpoint := StockingPoint_MP::FindCreateUpdate( routing.MacroPlan(), spname, unit, newrouting, true );
traverse( operation, OperationBOM, obom, not obom.IsInput() ){
pisp := obom.PISPNodeInRouting().ProductInStockingPoint_MP();
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Response_pnlActions_btnOk_OnClick.def
index 20dc8c9..4c15147 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Response_pnlActions_btnOk_OnClick.def
@@ -4,7 +4,6 @@
{
#keys: '[415136.0.756140039]'
DefinitionID: 'Responsedef_WebButton_OnClick'
- GroupServerCalls: true
Precondition:
[*
return Routing::ValidateThermalTrialRatio( feedback, ddlUnit.Data(), [Number]efMaxCapacity.Text(), dsStartTime.Date(), dsEndTime.Date(), [Number]efThermalTrialRatio.Text() );
@@ -15,5 +14,6 @@
[*
Form.OnOK();
*]
+ GroupServerCalls: false
}
}
--
Gitblit v1.9.3