From 15fadbdd3a65490a8a77af186522fe552f756085 Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Wed, 10 Jan 2024 22:48:41 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewPbomParentService.java   | 8 +-------
 .../bomnew/service/domain/EBom/CheckEBomException.java    | 7 ++++++-
 2 files changed, 7 insertions(+), 8 deletions(-)

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 102384e9..eb78f7d9 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
@@ -622,12 +622,6 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
      */
     public boolean realesePbom(Long bomRowId) {
         BomNewPbomParentEntity parent = this.getById(bomRowId);
-        VUtils.isTure(Objects.isNull(parent)).throwMessage("所选BOM-不存在");
-        if (parent.getMaterialNo().startsWith("31")) {
-            String orderNo = crmService.getOrderNo(parent.getMaterialNo());
-            parent.setOrderNo(orderNo);
-
-        }
         try {
             List<BomNewPbomParentVO> allBom = getAllBom(bomRowId, 0);
             List<Long> bomRowIds = allBom.stream().filter(u -> PBomStatusEnum.WAIT_PUBLISH.equalsValue(u.getStatus()) && u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList());
@@ -635,7 +629,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
             bomRowIds.add(bomRowId);
             this.getBaseMapper().bomRelease(state, SessionUtil.getUserName(), bomRowIds);
             //保存订单号
-            this.updateById(parent);
+//            this.updateById(parent);
         } catch (Exception ex) {
             throw new NflgBusinessException(STATE.BusinessError, "发布Pbom失败：" + ex.getMessage());
         }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
index 2132774b..5eb75f66 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
@@ -41,6 +41,8 @@ public class CheckEBomException {
     @Setter
     List<Integer> unCheckExcept;
 
+    private  Boolean checkWaring=false;
+
 
     public static void checkMaterialNoInMain1(List<String> materialNos) {
         // List<String> materialNos = dto.getDatas().stream().map(u -> u.getMaterialNo()).collect(Collectors.toList());
@@ -66,6 +68,7 @@ public class CheckEBomException {
         convert.setParentRowId(0L);
         convert.setLevelNumber(BigDecimal.ZERO);
         allBomDetail.add(convert);
+        checkWaring=true;
 
         // allBomDetail  = SpringUtil.getBean(BomNewEbomParentService.class).buildBomTreeContainSelf(bomRowId);
 
@@ -177,7 +180,9 @@ public class CheckEBomException {
         }
 //        checkCircularDependency(checkEBomExceptionDTOS);
         //bom异常-黄色警号
-        initExceptionYellowWarn(allBomDetail);
+        if(checkWaring) {
+            initExceptionYellowWarn(allBomDetail);
+        }
     }
 
     /**