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) {