From 550ebcf02217f8a0c6fe9001fcfa8e42e9cd6b83 Mon Sep 17 00:00:00 2001
From: yypsybs <yypsybs@foxmail.com>
Date: 星期二, 10 十月 2023 15:00:25 +0800
Subject: [PATCH] PR释放
---
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def
index 92e4f73..b488de3 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def
@@ -23,7 +23,7 @@
if( data.IsCreateNewVersion() ){
VersionControl::CreateNewSceneVersion( globalotdtable, testbusinesstype );
}else{
- VersionControl::CreateNewVersion( globalotdtable, testbusinesstype );
+ VersionControl::CopyVersion( globalotdtable, testbusinesstype );
}
versionname := VersionControl::GetVersionInfo( globalotdtable, testbusinesstype ).Element( 3 );
@@ -31,6 +31,13 @@
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() ) )
@@ -108,7 +115,7 @@
// sync data
if( data.EnableSync() ) {
MacroPlan::DoSync( macroPlanNew,
- data.BusinessType(), data.IsKeyProduct(), data.CreatePurchaseSupplyMaterial() );
+ data.BusinessType(), data.IsKeyProduct(), data.CreatePurchaseSupplyMaterial() ,GlobalOTDTable);
}
this.Close();
--
Gitblit v1.9.3