From 9a2ff8cb0b92a9aad7564c7152efd3d4b6f06a6a Mon Sep 17 00:00:00 2001 From: jun Date: Thu, 5 Dec 2024 10:18:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8A=9C=E6=B9=96=E8=A3=85=E7=AE=B1=E9=98=B2?= =?UTF-8?q?=E9=94=99=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7=E6=98=AF=E5=90=A6=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesBoxingErrorProofingService.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java index b04a64d..608390b 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java @@ -279,7 +279,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer //校验是否包含 String partNo = getPartNo(mesPackageDetail, mesPackage, defineDetails); //校验条码信息 - checkSn(mesPackageDetail, packingDefine); + checkSn(mesPackageDetail, packingDefine,partNo); //物料信息 return getPart(mesPackageDetail.getOrganizeCode(), partNo); } @@ -387,13 +387,16 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer return saveMesPackageDetail; } - private void checkSn(MesPackageDetail mesPackageDetail, MesPackingDefine packingDefine) { + private void checkSn(MesPackageDetail mesPackageDetail, MesPackingDefine packingDefine,String partNo) { List produceSnList = mesProduceSnExtService.getProduceSnList(mesPackageDetail.getOrganizeCode(), mesPackageDetail.getSerialNumber()); if (!CollectionUtils.isEmpty(produceSnList)) { MesProduceSn nextMesProduceSn = produceSnList.stream().sorted(Comparator.comparing(MesProduceSn::getCreateDatetime).reversed()).collect(Collectors.toList()).iterator().next(); if (!MesExtEnumUtil.PRODUCE_SN_STATUS.checkAllowBoxingErrorProofing(nextMesProduceSn.getSnStatus()) || !MesExtEnumUtil.PRODUCE_QC_STATUS.checkAllowBoxingErrorProofing(nextMesProduceSn.getQcStatus())) { MesPcnException.throwMesBusiException("条码【%s】状态【%s】质量状态【%s】不允许操作装箱防错，请检查数据！", mesPackageDetail.getSerialNumber(), MesExtEnumUtil.PRODUCE_SN_STATUS.valueOfDescription(nextMesProduceSn.getSnStatus()), MesExtEnumUtil.PRODUCE_QC_STATUS.valueOfDescription(nextMesProduceSn.getQcStatus())); } + if(!partNo.equals(nextMesProduceSn.getPartNo())){ + MesPcnException.throwMesBusiException("条码【%s】零件号【%s】和箱零件【%s】不匹配，请检查数据！", mesPackageDetail.getSerialNumber(), nextMesProduceSn.getPartNo(), partNo); + } } //查询加工记录 List productionRecordList = mesProductionRecordService.findProductionRecordList(mesPackageDetail.getOrganizeCode(), mesPackageDetail.getSerialNumber()); @@ -431,6 +434,10 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer if (Objects.isNull(partNo)) { MesPcnException.throwMesBusiException("零件条码【%s】未匹配到符合条码规则的数据，请检查数据！", mesPackageDetail.getSerialNumber()); } + //校验零件是否一致 + if (!partNo.equals(mesPackage.getPartNo())) { + MesPcnException.throwMesBusiException("零件条码【%s】包装定义明细零件【%s】和箱零件【%s】不一致，请检查数据！", mesPackageDetail.getSerialNumber(), partNo, mesPackage.getPartNo()); + } return partNo; }