Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-10 d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86

 _Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Method_ClickBtnOk.def

@@ -7,12 +7,12 @@
  [*
    // Disabled button to prevent the possibility of multiple firing
    
    btnOk.Enabled(false,'');
    //btnOk.Enabled(false,'');
    
    // OnOk
    this.ApplyChanges();
    
    DataHolderFillingCapacityOrder.Data().Commit();
    //DataHolderFillingCapacityOrder.Data().Commit();
    
    //if( not isnull( DataHolderForm.Data() ) )
    //{