From ef4d9490c7913ba974ad45009ef091cd001c71e8 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 2 Jan 2025 09:47:26 +0800 Subject: [PATCH] =?UTF-8?q?44631=20=E7=94=9F=E4=BA=A7=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E6=8E=A7=E5=88=B6D01CR01A=E4=BA=A7=E7=BA=BF=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E2=80=9C=E7=B3=BB=E7=BB=9F=E5=BC=82=E5=B8=B8=E2=80=9D?= =?UTF-8?q?=20(=E7=AC=AC=E4=BA=8C=E6=AC=A1=E4=BF=AE=E6=94=B9:=20=E6=94=B9?= =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E6=9E=9A=E4=B8=BE=E5=B1=9E=E6=80=A7=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=94=99=E8=AF=AF)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/step/MesProductResultErrorHandleStepService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 4dba70b..230acbb 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 @@ -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 productionPsOutContextList, List productionPartContextList, String productResult) { + private void saveProductResultException(StationRequestBean reqBean, List productionPsOutContextList, List 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();