展示组件

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

@@ -73,7 +73,7 @@ public class MesProductResultErrorHandleStepService extends BaseStepService {
         // 获取加工结果
         String result = mesProductionDispatchContextStepService.getProductResultContext(reqBean);
         // 如果是报废或者可疑，需要编辑条码状态为不合格、并且nc判定需要新增一条记录
-        if (StringUtils.isEmpty(result) || Objects.equal(MesExtEnumUtil.EQUIP_VARIABLE_CFG_CATEGORY.PRODUCT_OK.getCode(), result)) {
+        if (StringUtils.isEmpty(result) || Objects.equal(MesExtEnumUtil.EQUIP_VARIABLE_CFG_CATEGORY.PRODUCT_OK.getCode() + "", result)) {
             return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "加工结果合格,无需记录异常");
         }
         // 获取条码列表
@@ -132,6 +132,8 @@ public class MesProductResultErrorHandleStepService extends BaseStepService {
             mesPartInspectionDetail.setDefectTypeCode(mesDefectType.getDefectTypeCode());
             mesPartInspectionDetail.setDefectTypeName(mesDefectType.getDefectTypeName());
             model.setPartInspection(partInspection);
+            model.setType(partInspection.getSourceType());
+
             model.setPartInspectionDetailList(Arrays.asList(mesPartInspectionDetail));
             ncProcessingService.saveNc(model, reqBean.getOrganizeCode());
         });