From e7c56c4676e153f0af05083b1f5ab0ed73d4b2c3 Mon Sep 17 00:00:00 2001 From: Kevin Kok Khah Whey <khahwhey.kok@3ds.com> Date: 星期四, 12 十月 2023 19:19:53 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_Kevin --- _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def index 5d283ea..66ea53b 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def @@ -32,6 +32,13 @@ 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,8 +115,11 @@ // sync data if( data.EnableSync() ) { MacroPlan::DoSync( macroPlanNew, - data.BusinessType(), data.IsKeyProduct(), data.CreatePurchaseSupplyMaterial() ); + data.BusinessType(), data.IsKeyProduct(), data.CreatePurchaseSupplyMaterial() ,GlobalOTDTable); } + macroPlanNew.BusinessType( businesstype ); + macroPlanNew.IsKeyProduct( data.IsKeyProduct() ); + macroPlanNew.CreatePurchaseSupplyMaterial( data.CreatePurchaseSupplyMaterial() ); this.Close(); *] -- Gitblit v1.9.3