From 30c02e0c981b16be0918483543f4b812956c45d4 Mon Sep 17 00:00:00 2001
From: Lai,Risheng <risheng.lai@capgemini.com>
Date: 星期四, 02 十一月 2023 10:50:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev'
---
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def
index 66ea53b..fe1ca3b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def
@@ -6,7 +6,7 @@
[*
// Disabled button to prevent the possibility of multiple firing
- macroPlanOld := MacroPlan;
+ //macroPlanOld := MacroPlan;
btnOK.Enabled( false, '' )
@@ -19,13 +19,14 @@
// New version
globalotdtable := GlobalOTDTable;
+ globalotdsop := GlobalOTDSOP;
testbusinesstype := "闆嗗洟";
if( data.IsCreateNewVersion() ){
- VersionControl::CreateNewSceneVersion( globalotdtable, testbusinesstype );
+ VersionControl::CreateNewSceneVersion( globalotdsop, testbusinesstype );
}else{
- VersionControl::CopyVersion( globalotdtable, testbusinesstype );
+ VersionControl::CopyVersion( globalotdsop, testbusinesstype );
}
- versionname := VersionControl::GetVersionInfo( globalotdtable, testbusinesstype ).Element( 3 );
+ versionname := VersionControl::GetVersionInfo( globalotdsop, testbusinesstype ).Element( 3 );
// Get Version Name
if( data.Name() = "" ){
@@ -33,10 +34,11 @@
}
// Get Business Type from Scenario Name
- businesstype := select( globalotdtable,
- BusinessType,
- b,
- b.ScenarioName()=data.ScenarioName() ).BusinessTypeName();
+ businesstype := guard( select( globalotdtable,
+ BusinessType,
+ b,
+ b.ScenarioName()=data.ScenarioName() ).BusinessTypeName(),
+ "" );
data.BusinessType( businesstype );
// Copy scenario
@@ -110,7 +112,7 @@
}
macroPlanNew := MacroPlan;
- ManufactureLTImputation::Transfer( macroPlanOld, macroPlanNew );
+ //ManufactureLTImputation::Transfer( macroPlanOld, macroPlanNew );
// sync data
if( data.EnableSync() ) {
@@ -121,6 +123,8 @@
macroPlanNew.IsKeyProduct( data.IsKeyProduct() );
macroPlanNew.CreatePurchaseSupplyMaterial( data.CreatePurchaseSupplyMaterial() );
+ MacroPlan.UpdateStartOfPlanning( dsPlanningStart.Date().DateTime() );
+
this.Close();
*]
}
--
Gitblit v1.9.3