From f5aab939e04ea074f97a8d70bd7235ef01ab49b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Sat, 3 Aug 2024 10:35:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=ACPBOM=E4=BC=98=E5=8C=96-3(=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E9=94=99=E9=97=AE=E9=A2=98)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/mapper/master/BomNewEbomParentMapper.java     | 4 +++-
 .../product/bomnew/service/BomNewEbomParentService.java  | 3 ++-
 .../resources/mapper/master/BomNewEbomParentMapper.xml   | 9 +++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

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 532088a2..26e60dc3 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
@@ -59,7 +59,9 @@ public interface BomNewEbomParentMapper extends BaseMapper<BomNewEbomParentEntit
 
     void delBatch(@Param("rowIds") List<Long> rowIds);
 
-    void updateStateBatchByRowIds(@Param("status") Integer status, String userName, @Param("list") List<Long> list);
+    void updateStateBatchByRowIdsParent(@Param("status") Integer status, String userName, @Param("list") List<Long> list);
+
+    void updateStateBatchByRowIdsChild( @Param("list") List<Long> list);
 
     Integer checkIsRoot(@Param("materialNo") String materialNo);
 
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 5254741b..c800af6e 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
@@ -1028,7 +1028,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             }
             //List<Long> bomRowIds = bomTree.stream().filter(u ->!EBomStatusEnum.PUBLISHED.equalsValue(u.getStatus()) && u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList());
             if (CollUtil.isNotEmpty(eBomToPBom.getAddEBomNew())) {
-                this.getBaseMapper().updateStateBatchByRowIds(EBomStatusEnum.PUBLISHED.getValue(), SessionUtil.getRealName(), eBomToPBom.getAddEBomNew());
+                this.getBaseMapper().updateStateBatchByRowIdsParent(EBomStatusEnum.PUBLISHED.getValue(), SessionUtil.getRealName(), eBomToPBom.getAddEBomNew());
+                this.getBaseMapper().updateStateBatchByRowIdsChild(eBomToPBom.getAddEBomNew());
             }
             //替换需覆盖的受影响的虚拟包
             if(CollUtil.isNotEmpty(eBomToPBom.getUpgradeChangeResultForCover())){
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 76d47dc8..7cef6dbf 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
@@ -310,13 +310,18 @@
         </foreach>;
     </delete>
 
-    <update id="updateStateBatchByRowIds">
+    <update id="updateStateBatchByRowIdsParent">
         update t_bom_new_ebom_parent set status=#{status} ,
         convert_to_ebom_time=now(),release_time=now(),release_user_name=#{userName},edit_status=2,exception_status=1
         where row_id in
         <foreach collection="list" item="item" open="(" close=")" separator=",">
             #{item}
-        </foreach>;
+        </foreach>
+
+    </update>
+
+    <update id="updateStateBatchByRowIdsChild">
+
         UPDATE t_bom_new_ebom_child SET edit_status=2 WHERE parent_row_id IN
         <foreach collection="list" item="item" open="(" close=")" separator=",">
             #{item}