Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj

hongji.li

2023-09-26 adb1e2a3ceae2acbe7f9ef6d6e3db5c1f982a763

 _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() );