From 462215553c754d26acde8edab81b4a73f774e21e Mon Sep 17 00:00:00 2001
From: renhao <renhui.hao@capgemini.com>
Date: 星期五, 13 十月 2023 11:20:48 +0800
Subject: [PATCH] Merge branch 'dev'
---
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def
index 1d0ed83..d2fe1c9 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, '' )
@@ -16,6 +16,28 @@
data := DataHolderDialogData.Data();
newscenario := null( Scenario );
strategy := null( Strategy );
+
+ // New version
+ globalotdtable := GlobalOTDTable;
+ testbusinesstype := "闆嗗洟";
+ if( data.IsCreateNewVersion() ){
+ VersionControl::CreateNewSceneVersion( globalotdtable, testbusinesstype );
+ }else{
+ VersionControl::CopyVersion( globalotdtable, testbusinesstype );
+ }
+ versionname := VersionControl::GetVersionInfo( globalotdtable, testbusinesstype ).Element( 3 );
+
+ // Get Version Name
+ if( data.Name() = "" ){
+ data.Name( versionname );
+ }
+
+ // Get Business Type from Scenario Name
+ businesstype := select( globalotdtable,
+ BusinessType,
+ b,
+ b.ScenarioName()=data.ScenarioName() ).BusinessTypeName();
+ data.BusinessType( businesstype );
// Copy scenario
if( isnull( data.WrappedInstance() ) )
@@ -88,22 +110,16 @@
}
macroPlanNew := MacroPlan;
- ManufactureLTImputation::Transfer( macroPlanOld, macroPlanNew );
+ //ManufactureLTImputation::Transfer( macroPlanOld, macroPlanNew );
// sync data
if( data.EnableSync() ) {
MacroPlan::DoSync( macroPlanNew,
- data.BusinessType(), data.IsKeyProduct(), data.CreatePurchaseSupplyMaterial() );
+ data.BusinessType(), data.IsKeyProduct(), data.CreatePurchaseSupplyMaterial() ,GlobalOTDTable);
}
-
- // New version
- globalotdtable := GlobalOTDTable;
- testbusinesstype := "闆嗗洟";
- if( data.IsCreateNewVersion() ){
- VersionControl::CreateNewSceneVersion( globalotdtable, testbusinesstype );
- }else{
- VersionControl::CreateNewVersion( globalotdtable, testbusinesstype );
- }
+ macroPlanNew.BusinessType( businesstype );
+ macroPlanNew.IsKeyProduct( data.IsKeyProduct() );
+ macroPlanNew.CreatePurchaseSupplyMaterial( data.CreatePurchaseSupplyMaterial() );
this.Close();
*]
--
Gitblit v1.9.3