From d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86 Mon Sep 17 00:00:00 2001
From: yanweiyuan3 <yanweiyuan3@gmail.com>
Date: 星期二, 10 十月 2023 17:45:58 +0800
Subject: [PATCH] Merge branch 'dev' into dev_yy

---
 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def
index b8022af..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() ) )
     {
@@ -110,6 +117,9 @@
         MacroPlan::DoSync( macroPlanNew, 
                            data.BusinessType(), data.IsKeyProduct(), data.CreatePurchaseSupplyMaterial() ,GlobalOTDTable);
     }
+    macroPlanNew.BusinessType( businesstype );
+    macroPlanNew.IsKeyProduct( data.IsKeyProduct() );
+    macroPlanNew.CreatePurchaseSupplyMaterial( data.CreatePurchaseSupplyMaterial() );
     
     this.Close();
   *]

--
Gitblit v1.9.3