From ac23d075a53284f80f28836d98f8d743958658ad Mon Sep 17 00:00:00 2001
From: 10002327 <lhj123456>
Date: Wed, 6 Nov 2024 10:40:26 +0800
Subject: [PATCH] =?UTF-8?q?EBOM=E5=B7=A5=E4=BD=9C=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E4=B8=AD=E3=80=90=E5=88=A0=E9=99=A4=E3=80=91=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=8A=B6=E6=80=81=E6=98=AF=E5=90=A6=E4=B8=BA?=
 =?UTF-8?q?=E8=8D=89=E7=A8=BF=E7=8A=B6=E6=80=81=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewEbomParentService.java    | 7 +++++--
 .../product/bomnew/service/BomNewPbomParentService.java    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

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 61b5fee7..217c44f0 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
@@ -451,8 +451,9 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                         child.setEditStatus(parent.getEditStatus());
                         child.setVirtualPackageIs(parent.getVirtualPackageIs());
                         child.setSuperMaterialStatus(parent.getSuperMaterialStatus());
-                        // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241012
-                        if(MaterialshouldBomExistUtil.checkNoNeedBom(child)){
+                        // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料、项目类别为T项，版本号显示B00 by 10002327 241012
+                        if(MaterialshouldBomExistUtil.checkNoNeedBom(child)
+                        || Objects.equals(child.getProjectType(),"T")){
                             child.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
                         }else if (MaterialshouldBomExistUtil.checkShouldBomExist(child)) {
                             child.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
@@ -3214,6 +3215,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         BomNewEbomParentEntity parent = getById(bomRowId);
         VUtils.isTure(Objects.isNull(parent)).throwMessage("bom不存在");
         //        VUtils.isTure(root.getRootIs() != 1 && root.getUserRootIs() != 1).throwMessage("请选择根节点");
+        //校验状态，发布PBOM以后，不能再删除  10002327  241106
+        VUtils.isTure(parent.getStatus() != null && parent.getStatus() >= EBomStatusEnum.PUBLISHED.getValue()).throwMessage("发布PBOM之后，不能再删除~");
 
         LogRecordContext.putVariable("bom", parent);
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index 4381b257..0269ba6b 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -494,7 +494,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
                         } else {
                             child.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION);
                         }
-                        if (type == 0 && child.getStatus() >= EBomStatusEnum.PUBLISHED.getValue()) {
+                        if (type == 0 && child.getStatus() != null && child.getStatus() >= EBomStatusEnum.PUBLISHED.getValue()) {
                             child.setStatus(PBomStatusEnum.BORROWED_PARTS.getValue());
                         }
                     }