From 01f9898de281cdbcb94a4e0aab5045350aca774a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 28 Dec 2024 19:04:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?44242=20PCN:=E8=A3=85=E7=AE=B1=E9=98=B2?= =?UTF-8?q?=E9=94=99=EF=BC=8C=E5=B7=B2=E7=BB=8F=E5=85=B3=E7=AE=B1=E7=9A=84?= =?UTF-8?q?=E7=AE=B1=E6=9D=A1=E7=A0=81=EF=BC=8C=E5=A6=82=E6=9E=9C=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=89=AB=E6=8F=8F=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E4=B8=8B=E4=B8=80=E4=B8=AA=E9=9C=80=E8=A6=81=E8=A3=85=E7=AE=B1?= =?UTF-8?q?=E7=9A=84=E6=9D=A1=E7=A0=81=20=20=20(uat-temp-castle-20241224-4?= =?UTF-8?q?4242-new)=20merge=20=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b75cfe5..84e1656 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 @@ -535,7 +535,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer if (produceSn.getQcStatus() == MesExtEnumUtil.PRODUCE_QC_STATUS.SCRAP.getValue()){ MesPcnException.throwMesBusiException("扫描条码【%s】零件号【%s】,QC为报废状态，不能包装此零件！", mesPackage.getPackageSn(), partNo); } - //SN 条码状态 + //SN 条码状态 if (produceSn.getSnStatus() == MesExtEnumUtil.PRODUCE_SN_STATUS.UNKNOW.getValue()){ MesPcnException.throwMesBusiException("扫描条码【%s】零件号【%s】,条码状态为未知，不能包装此零件！", mesPackage.getPackageSn(), partNo); } From 04f9abeb206ae495301a3d88ab6c03ab33a0b6f4 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 29 Dec 2024 08:00:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=2044632=20=E9=9B=B6=E4=BB=B6=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E7=BB=84=20=E6=98=8E=E7=BB=86=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java index d55d0c3..b3c28d4 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java @@ -206,6 +206,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService }else{ //自制件校验前道工艺 零件发运组详情中的优先 MesPartShippingGroupDetail groupDetail = mesPartShippingGroupService.getMesPartShippingGroupDetailByPartNo(organizeCode, shippingGroup.getShippingGroupCode(), produceSn.getPartNo()); + if (null == groupDetail) return true; if (!StringUtils.isEmpty(groupDetail.getFrontProcessCode())){ Integer count = mesProductionRecordService.findFrontProcessProductionRecord(organizeCode, produceSn.getProductSn(), groupDetail.getFrontProcessCode()); if (count > 0){