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

Kevin Kok Khah Whey

2023-09-25 34d29be6a3eb0c025da50b77f2107c4ad259c6c0

 _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 );
    
@@ -108,7 +108,7 @@
    // sync data
    if( data.EnableSync() ) {
        MacroPlan::DoSync( macroPlanNew, 
                           data.BusinessType(), data.IsKeyProduct(), data.CreatePurchaseSupplyMaterial() );
                           data.BusinessType(), data.IsKeyProduct(), data.CreatePurchaseSupplyMaterial() ,GlobalOTDTable);
    }
    
    this.Close();