From 4fb0a338de2bbf092f115b4300f80b1f7d8297ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 5 Jul 2024 10:07:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=9F=E6=88=90=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E5=8C=85=E5=89=8D=E8=BF=9B=E8=A1=8C=E5=BC=82=E5=B8=B8=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=EF=BC=8C=E6=9C=89=E5=BC=82=E5=B8=B8=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E7=94=9F=E6=88=90=E8=99=9A=E6=8B=9F=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BomNewEbomGenerateVirtualPackageServiceFor31Impl.java | 6 ++++++ .../product/bomnew/service/BomNewEbomParentService.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomGenerateVirtualPackageServiceFor31Impl.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomGenerateVirtualPackageServiceFor31Impl.java index b00d2933..ea8bfe95 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomGenerateVirtualPackageServiceFor31Impl.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomGenerateVirtualPackageServiceFor31Impl.java @@ -71,6 +71,12 @@ public class BomNewEbomGenerateVirtualPackageServiceFor31Impl implements IBomNew BomNewEbomParentEntity root = ebomParentService.getById(query.getParentRowId()); VUtils.isTure(Objects.isNull(root)).throwMessage("无效的数据"); + //异常检查 + ebomParentService.batchCheckAndSaveEBomException(Collections.singletonList(root.getRowId())); + + VUtils.isTure(!Objects.equals(root.getExceptionStatus(), EBomExceptionStatusEnum.OK.getValue()) + && !Objects.equals(root.getExceptionStatus(), EBomExceptionStatusEnum.EXCEPT_NO_8.getValue())) + .throwMessage("请先解决异常再生成发货包"); VUtils.isTure(root.getMaterialNo().startsWith("21")).throwMessage("21编码接口调用错误"); VUtils.isTure(!root.getMaterialNo().startsWith("31")).throwMessage("该编码的物料不能生成发货包：" + root.getMaterialNo()); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 87c75503..7fad3971 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -909,7 +909,7 @@ public class BomNewEbomParentService extends ServiceImpl 0).throwMessage("已生成过虚拟包，不能2次生成"); VUtils.isTure(!Objects.equals(root.getExceptionStatus(), EBomExceptionStatusEnum.OK.getValue()) && !Objects.equals(root.getExceptionStatus(), EBomExceptionStatusEnum.EXCEPT_NO_8.getValue())) - .throwMessage("异常状态下不允许生成虚拟包"); + .throwMessage("请先解决异常再生成发货包"); LogRecordContext.putVariable("gvbom", root); BomNewEbomParentVO parent = Convert.convert(BomNewEbomParentVO.class, root);