From 6bfd3075987a68ab5c00008d14160a702da1d42e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?=
 =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com>
Date: Sun, 30 Jun 2024 14:31:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/step/MesProductResultErrorHandleStepService.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductResultErrorHandleStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductResultErrorHandleStepService.java
index 13078f9..61e5cca 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductResultErrorHandleStepService.java
+++ b/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());
         });