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

hongji.li

2023-09-26 adb1e2a3ceae2acbe7f9ef6d6e3db5c1f982a763

 _Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Method_ClickBtnOk.def

@@ -11,9 +11,12 @@
    
    // OnOk
    this.ApplyChanges();
    
    DataHolderFilling.Data().Commit();
    
    fillingData := DataHolderFilling.Data();
    
    CustomerAndForecastOrder::CreateFillingCapacityOrder( MacroPlan, fillingData.WrappedInstance());
    
    //if( not isnull( DataHolderForm.Data() ) )
    //{
    //  // Access the form, select the new assumption