Merge branch 'dev' into dev_yy

yanweiyuan3

2023-09-21 765e7ec8426f896bf78a8749e38bd1656ca05474

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPanelPullPlanReport/Response_pnlActions_btnOk_OnClick.def

对比新文件
@@ -0,0 +1,35 @@
Quintiq file version 2.0
#parent: pnlActions/btnOk
Response OnClick () id:Response_pnlActions_btnOk_OnClick
{
  #keys: '[414702.0.157903693]'
  DefinitionID: 'Responsedef_WebButton_OnClick'
  QuillAction
  {
    Body:
    [*
      Form.ApplyChanges();
      
      //Form.OnOK();
      Form.ApplyChanges();
      
      data := DataHolderDialogData.Data();
      panelMaterial := data.WrappedInstance();
      if ( isnull( panelMaterial ) ) {
        MacroPlan.PanelMaterial( relnew, 
                                 PanelModel          := ddslPanelModel.Text(), 
                                 MaterialDescription := efMaterialDescription.Text(), 
                                 StartDate           := dsStartDate.Date(),
                                 DemandQuantity      := npDemandQuantity.Number() );
      } else {
        panelMaterial.PanelModel( ddslPanelModel.Text() );
        panelMaterial.MaterialDescription( efMaterialDescription.Text() );
        panelMaterial.StartDate( dsStartDate.Date() );
        panelMaterial.DemandQuantity( npDemandQuantity.Number() );
      }
      
      Form.Close();
    *]
    GroupServerCalls: false
  }
}