From 3c8d341bdb78fe8baf112d59a40bcdd090eb7c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Mon, 15 Apr 2024 10:03:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=9F=E5=A7=8Bbom=E8=BD=AC=E6=8D=A2e?=
 =?UTF-8?q?bom=E5=90=8E=E9=87=8D=E6=96=B0=E8=AE=BE=E7=BD=AE=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=9C=89bom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/api/user/OriginalBomApi.java   |  2 ++
 .../mapper/master/BomNewEbomParentMapper.java     |  8 ++++++--
 .../bomnew/service/BomNewEbomParentService.java   | 15 ++++++++++++++-
 .../OriginalBom/OriginalBomToEBomConvert.java     |  3 +--
 .../mapper/master/BomNewEbomParentMapper.xml      |  6 ++++++
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
index 071dcd8d..4d243fac 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
@@ -176,6 +176,8 @@ public class OriginalBomApi extends BaseApi {
         ebomParentService.getBaseMapper().updateRootState();
         ebomParentService.getBaseMapper().updateRootForWaitReview();
 
+        ebomParentService.resetAllBomExist();
+
         return ResultVO.success(result);
     }
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java
index 5246146c..7042abf3 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java
@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
 import com.nflg.product.bomnew.pojo.query.BomNewEbomParentQuery;
-import com.nflg.product.bomnew.pojo.query.OriginalBomQuery;
-import com.nflg.product.bomnew.pojo.vo.*;
+import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
+import com.nflg.product.bomnew.pojo.vo.BomNewEbomUpgradeChangeVO;
+import com.nflg.product.bomnew.pojo.vo.MaterialHistoryProjectTypeVO;
+import com.nflg.product.bomnew.pojo.vo.ReverseReportVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Collection;
@@ -74,4 +76,6 @@ public interface BomNewEbomParentMapper extends BaseMapper<BomNewEbomParentEntit
     void resetBomExist(Long rowId);
 
     Set<String> getMaterialParent(@Param("materialNos") Collection<String> materialNos ,@Param("createdBy") String createdBy);
+
+    void resetAllBomExist();
 }
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 4c1de7c3..1260cb62 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
@@ -2045,7 +2045,20 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         LogRecordContext.putVariable("bom", ent);
     }
 
-    private void resetBomExist(Long rowId) {
+    /**
+     * 重置BOM存在状态
+     * @param rowId 父级节点rowId
+     */
+    public void resetBomExist(Long rowId) {
+        log.debug("resetBomExist：{}", rowId);
         this.getBaseMapper().resetBomExist(rowId);
     }
+
+    /**
+     * 重置所有BOM存在状态
+     */
+    public void resetAllBomExist() {
+        log.debug("resetAllBomExist");
+        this.getBaseMapper().resetAllBomExist();
+    }
 }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java
index 5c3a089c..3a65edeb 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java
@@ -306,7 +306,6 @@ public class OriginalBomToEBomConvert extends BaseConvert {
 
         // this.eBomChildResult.add(childEntity);
         return childEntity;
-
     }
 
     /**
@@ -327,7 +326,7 @@ public class OriginalBomToEBomConvert extends BaseConvert {
         eBomParent.setSourceRowId(parentEnt.getBomRowId());
         eBomParent.setLastVersionIs(1);
         eBomParent.setEditStatus(EbomEditStatusEnum.HANDLER_CREATED.getValue());
-        eBomParent.setModifyTime(LocalDateTime.now());
+        //eBomParent.setModifyTime(LocalDateTime.now());
         eBomParent.setBomExist(parentEnt.getBomRowId() > 0 ? 1 : 0);
         eBomParent.setDeviseName(SessionUtil.getRealName());
         eBomParent.setDeptName(SessionUtil.getDepartName());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
index 87a529a2..8ae61f3a 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
@@ -353,4 +353,10 @@
         SET p.bom_exist = (IF(EXISTS (SELECT 1 FROM t_bom_new_ebom_child WHERE parent_row_id = p.row_id), 1, 0))
         WHERE p.row_id = #{rowId};
     </select>
+
+    <select id="resetAllBomExist">
+        UPDATE t_bom_new_ebom_parent p
+        SET p.bom_exist = (IF(EXISTS (SELECT 1 FROM t_bom_new_ebom_child WHERE parent_row_id = p.row_id), 1, 0))
+        WHERE p.status &lt; 4;
+    </select>
 </mapper>