Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-10 d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86

 _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