44631 生产过程控制D01CR01A产线，提示“系统异常” (第二次修改: 改工步枚举属性判断错误)

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductResultErrorHandleStepService.java

@@ -93,7 +93,7 @@ public class MesProductResultErrorHandleStepService extends BaseStepService {
 
         try {
             // 保存加工异常记录(NC判断记录)
-            saveProductResultException(reqBean, productionPsOutContextList, productionPartContextList, productResult);
+            saveProductResultException(reqBean, productionPsOutContextList, productionPartContextList, resultInt);
         } catch (ImppBusiException e) {
             stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), String.format("加工[%s] NC信息保存失败: %s", MesExtEnumUtil.PRODUCE_QC_STATUS.valueOfDescription(resultInt), e.getErrorDetail()));
         } catch (Exception e) {
@@ -111,7 +111,7 @@ public class MesProductResultErrorHandleStepService extends BaseStepService {
      * @param reqBean
      * @param productionPsOutContextList
      */
-    private void saveProductResultException(StationRequestBean reqBean, List<MesProductionPsOutContext> productionPsOutContextList, List<MesProductionPartContext> productionPartContextList, String productResult) {
+    private void saveProductResultException(StationRequestBean reqBean, List<MesProductionPsOutContext> productionPsOutContextList, List<MesProductionPartContext> productionPartContextList, Integer productResult) {
         String defectTypeCode = MesEnumUtil.DEFECT_TYPE_CODE.DETERMIND.getValue();
         productionPsOutContextList.forEach(mesProduceSn -> {
             String productVersion = null;
@@ -140,7 +140,7 @@ public class MesProductResultErrorHandleStepService extends BaseStepService {
             partInspection.setDefectTypeCode(mesDefectType.getDefectTypeCode());
             partInspection.setInspectionDate(TimeTool.getToday());
             partInspection.setLotNo(mesProduceSn.getLotNo());
-            if (Objects.equal(MesExtEnumUtil.EQUIP_VARIABLE_CFG_CATEGORY.PRODUCT_SCRAP.getValue(), productResult)) {
+            if (productResult.compareTo(MesExtEnumUtil.PRODUCE_QC_STATUS.SCRAP.getValue()) == 0) {
                 partInspection.setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.SCRAP.getValue());
             } else {
                 partInspection.setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.CREATE.getValue());
@@ -171,7 +171,7 @@ public class MesProductResultErrorHandleStepService extends BaseStepService {
 
             model.setPart(mesPartSap);
             model.setPartInspectionDetailList(Arrays.asList(mesPartInspectionDetail));
-            if (Objects.equal(MesExtEnumUtil.EQUIP_VARIABLE_CFG_CATEGORY.PRODUCT_SCRAP.getValue(), productResult)) {
+            if (productResult.compareTo(MesExtEnumUtil.PRODUCE_QC_STATUS.SCRAP.getValue()) == 0) {
                 ncProcessingService.saveNc(model, reqBean.getOrganizeCode(), true);
             } else {
                 MesPartInspectionInputModel inspectModel = new MesPartInspectionInputModel();