From 2657180fea76b56bdaeefbd4cb63b53dad500f93 Mon Sep 17 00:00:00 2001 From: jun Date: Tue, 20 Aug 2024 18:17:51 +0800 Subject: [PATCH] =?UTF-8?q?NC=E5=A4=84=E7=90=86=EF=BC=8C=E5=8D=95=E4=BB=B6?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=BD=AC=E6=AD=A3=E5=B8=B8=E4=B8=8D=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=9D=A1=E7=A0=81=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesNcProcessingService.java | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java index 33bebb8..292f37b 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java @@ -346,11 +346,14 @@ public class MesNcProcessingService implements IMesNcProcessingService { if (type == MesExtEnumUtil.NC_TYPE.NORMAL.getValue()) { - checkProduceSn(sn, model.getSn()); - //更新条码质量状态 - sn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.SUSPICIOUS_TO_QUALIFIED.getValue()); - ConvertBean.serviceModelUpdate(sn, model.getPartInspection().getModifyUser()); - produceSnExtService.update(sn); + //批次不需要校验条码 + if (model.getPartInspection().getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()) { + checkProduceSn(sn, model.getSn()); + //更新条码质量状态 + sn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.SUSPICIOUS_TO_QUALIFIED.getValue()); + ConvertBean.serviceModelUpdate(sn, model.getPartInspection().getModifyUser()); + produceSnExtService.update(sn); + } //更新检验单 if (model.getType() != 10 && model.getType() != 40) { @@ -448,11 +451,14 @@ public class MesNcProcessingService implements IMesNcProcessingService { } } else if (type == MesExtEnumUtil.NC_TYPE.RELEASE.getValue()) { - checkProduceSn(sn, model.getSn()); - //更新条码质量状态 - sn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue()); - ConvertBean.serviceModelUpdate(sn, model.getPartInspection().getModifyUser()); - produceSnExtService.update(sn); + //批次不需要校验条码 + if (model.getPartInspection().getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()) { + checkProduceSn(sn, model.getSn()); + //更新条码质量状态 + sn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue()); + ConvertBean.serviceModelUpdate(sn, model.getPartInspection().getModifyUser()); + produceSnExtService.update(sn); + } //更新检验单 if (model.getType() != 10 && model.getType() != 40) {