Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-17 face55e7f35130d29d7f395a4b4501d57b97ef81

 _Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnOk_OnClick.def

@@ -12,7 +12,7 @@
      
      data := DataHolderDialogData.Data().WrappedInstance();
      if ( isnull( data ) ) {
        GlobalOTDTable.CapacityAllocationResultsRuleConfiguration( relnew,
        GlobalOTDSOP.CapacityAllocationResultsRuleConfiguration( relnew,
                                                                   PanelMaterialCode  := efPanelMaterialCode.Text(),
                                                                   ModuleMaterialCode := efModuleMaterialCode.Text(),
                                                                   Division           := efDivision.Text(),
@@ -20,7 +20,7 @@
                                                                  );
      } else {
        data.Delete();
        GlobalOTDTable.CapacityAllocationResultsRuleConfiguration( relnew,
        GlobalOTDSOP.CapacityAllocationResultsRuleConfiguration( relnew,
                                                                   PanelMaterialCode  := efPanelMaterialCode.Text(),
                                                                   ModuleMaterialCode := efModuleMaterialCode.Text(),
                                                                   Division           := efDivision.Text(),