From edb53d338454cf5712757c1d6d6670c8edf6ab16 Mon Sep 17 00:00:00 2001 From: jason Date: Mon, 12 May 2025 11:20:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E8=A3=85=E9=85=8D=E4=BB=B6=E5=90=8E=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/station/function/MesFunctionAssemblyReplaceService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java index 1e64817..126cb11 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java @@ -80,7 +80,6 @@ public class MesFunctionAssemblyReplaceService extends BaseSwsService implements requestModel.setOrganizeCode(organizeCode); requestModel.setCustSn(custSn); requestModel.setIsOrigSn(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); - requestModel.setAssemblyPartStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue()); List mesProductionRecords = mesReworkTaskService.assemblyQuery(requestModel); paramMap.put(MesPcnExtConstWords.ORGANIZE_CODE, reqBean.getOrganizeCode()); //根据配置查询生产队列工位推送信息 From eeacec72bf5b31ad13a7025e33f74c53a9aee120 Mon Sep 17 00:00:00 2001 From: jason Date: Mon, 12 May 2025 13:08:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=BC=BA=E8=BF=87=E5=90=8E=EF=BC=8C=E6=A3=80=E9=AA=8C=E8=BF=99?= =?UTF-8?q?=E4=B8=AA=E6=9D=A1=E7=A0=81=E6=98=AF=E4=B8=8D=E6=98=AF=E6=89=AB?= =?UTF-8?q?=E8=BF=87=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/busi/MesNingDeShippingCheckService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNingDeShippingCheckService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNingDeShippingCheckService.java index f765ceb..3c31b0a 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNingDeShippingCheckService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNingDeShippingCheckService.java @@ -468,6 +468,11 @@ public class MesNingDeShippingCheckService implements IMesNingDeShippingCheckSer if(!shippingOrderManagementDetailOptional.isPresent()){ throw new ImppBusiException(String.format("【%s】明细已全部扫描完成，请检查数据！", orderManagement.getShippingCode())); } + for (MesShippingOrderManagementDetail detail : model.getDetailList()) { + if (Objects.equals(detail.getSecondScanFlg(), MesCommonConstant.TRUE_INTEGER) && Objects.equals(detail.getBarcode(), model.getSn())) { + throw new ImppBusiException(String.format("【%s】条码已进行二次发运扫描，请检查数据！", model.getSn())); + } + } MesProduceSn produceSn = checkSecondSn(model); //更新明细 MesShippingOrderManagementDetail detail = shippingOrderManagementDetailOptional.get();