From be0ad5eb80263d6a024d65e1cedad6cb9e6a1bf6 Mon Sep 17 00:00:00 2001 From: jun Date: Tue, 6 Aug 2024 08:12:38 +0800 Subject: [PATCH] =?UTF-8?q?NC=E5=A4=84=E7=90=86=E8=BF=94=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E9=9C=80=E8=A6=81=E5=8D=A1=E6=8E=A7=E6=9D=A1?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesNcProcessingService.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 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 08aa6d5..8f38983 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 @@ -417,12 +417,14 @@ public class MesNcProcessingService implements IMesNcProcessingService { moveRepository.save(move); } else if (type == MesExtEnumUtil.NC_TYPE.SCRAP.getValue()) { - - checkProduceSn(sn, model.getSn()); - //更新条码质量状态 - sn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.SCRAP.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.SCRAP.getValue()); + ConvertBean.serviceModelUpdate(sn, model.getPartInspection().getModifyUser()); + produceSnExtService.update(sn); + } //更新检验单 DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);