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