Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-10 d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPanelPullPlanReport/Response_pnlActions_btnOk_OnClick.def

@@ -16,11 +16,11 @@
      data := DataHolderDialogData.Data();
      panelMaterial := data.WrappedInstance();
      if ( isnull( panelMaterial ) ) {
        GlobalOTDTable.PanelMaterial( relnew, 
                                      PanelModel          := ddslPanelModel.Text(), 
                                      MaterialDescription := efMaterialDescription.Text(), 
                                      StartDate           := dsStartDate.Date(),
                                      DemandQuantity      := npDemandQuantity.Number() );
        MacroPlan.PanelMaterial( relnew, 
                                 PanelModel          := ddslPanelModel.Text(), 
                                 MaterialDescription := efMaterialDescription.Text(), 
                                 StartDate           := dsStartDate.Date(),
                                 DemandQuantity      := npDemandQuantity.Number() );
      } else {
        panelMaterial.PanelModel( ddslPanelModel.Text() );
        panelMaterial.MaterialDescription( efMaterialDescription.Text() );