From 86e49645e2d587a374312255da0400a1e83fea89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Fri, 22 Mar 2024 14:05:08 +0800
Subject: [PATCH] =?UTF-8?q?ebom=E5=88=A0=E9=99=A4=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=A0=A1=E9=AA=8C=EF=BC=8C=E4=BB=85=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=BA=E5=BE=85=E5=A4=8D=E6=A0=B8=E5=92=8C=E5=B7=B2?=
 =?UTF-8?q?=E9=80=80=E5=9B=9E=E6=89=8D=E8=83=BD=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewEbomParentService.java     | 6 ++++++
 1 file changed, 6 insertions(+)

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 dbac4065..874302be 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
@@ -6,6 +6,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.core.thread.ThreadUtil;
+import cn.hutool.core.util.EnumUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
@@ -1471,6 +1472,11 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             VUtils.isTure(!parentEntity.getCreatedBy().equals(SessionUtil.getUserCode())).throwMessage("该节点不属于你，你无权删除");
         }
 
+        //待复核和已退回才能删除
+        VUtils.isTure(parentEntity.getStatus().equals(EBomStatusEnum.WAIT_CHECK.getValue())
+                        || parentEntity.getStatus().equals(EBomStatusEnum.RETURNED.getValue()))
+                .throwMessage(EnumUtil.fromString(EBomStatusEnum.class, parentEntity.getStatus().toString()).getDescription() + "状态不能删除");
+
         EBomDel eBomDel = new EBomDel(bomRowId);
         eBomDel.classifyBom();