Merge branch 'dev'

renhao

2023-10-18 4f426fd0938d68df759fff7570ad6ec2e62bac96

 _Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Method_ClickBtnOk.def

@@ -7,15 +7,15 @@
  [*
    // Disabled button to prevent the possibility of multiple firing
    
    btnOk.Enabled(false,'');
    //btnOk.Enabled(false,'');
    
    // OnOk
    this.ApplyChanges();
    DataHolderFilling.Data().Commit();
    //DataHolderFilling.Data().Commit();
    
    fillingData := DataHolderFilling.Data();
    //fillingData := DataHolderFilling.Data();
    
    CustomerAndForecastOrder::CreateFillingCapacityOrder( MacroPlan, fillingData.WrappedInstance());
    //CustomerAndForecastOrder::CreateFillingCapacityOrder( MacroPlan, fillingData.WrappedInstance());
    
    //if( not isnull( DataHolderForm.Data() ) )
    //{
@@ -23,6 +23,15 @@
    //  DataHolderForm.Data().ListAssumptions().SelectByKey( DataHolderDialogData.Data().WrappedInstance().Key() );
    //}
    
    FillingCapacityOrder::CreateFillingCapacityOrder( MacroPlan, 
                                                      DataHolderFilling.Data().OrderID(),
                                                      [Real]edtSalesAmount.Text(),
                                                      dsDemandDate.Date(),
                                                      dsForecastDemandDate.Date(),
                                                      ddslOrderType.Text(),
                                                      DataHolderFilling.Data().VerNo()
                                                     );
    
    this.Close();
  *]
}