Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_Kevin

Kevin Kok Khah Whey

2023-11-07 5ae534ab606e6f2ba5ea60914224d665b0447d5a

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditScenario/Method_OnOk.def

@@ -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
@@ -121,6 +123,8 @@
    macroPlanNew.IsKeyProduct( data.IsKeyProduct() );
    macroPlanNew.CreatePurchaseSupplyMaterial( data.CreatePurchaseSupplyMaterial() );
    
    MacroPlan.UpdateStartOfPlanning( dsPlanningStart.Date().DateTime() );
    
    this.Close();
  *]
}