From 37856ae88800e9e3588544d9c65d8c90b7eb1482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Mon, 5 Aug 2024 08:24:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98-=E6=8B=86=E5=88=86sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/master/BomNewEbomParentMapper.java       |  5 +++++
 .../bomnew/service/BomNewEbomParentService.java     |  7 ++++++-
 .../mapper/master/BomNewEbomParentMapper.xml        | 13 +++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

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 699b0cfd..757cb8d2 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
@@ -109,8 +109,13 @@ public interface BomNewEbomParentMapper extends BaseMapper<BomNewEbomParentEntit
      */
     void insertEBomFormalChild(@Param("parentRowIds") List<Long> parentRowIds);
 
+    @Deprecated
     void delEBomHistory(@Param("parentRowIds") List<Long> parentRowIds);
 
+    void delEBomHistory1(@Param("parentRowIds") List<Long> parentRowIds);
+
+    void delEBomHistory2(@Param("parentRowIds") List<Long> parentRowIds);
+
     Page<BomNewEbomParentVO> getSapErrorWorksheet(Page<Object> objectPage,@Param("query")BomNewEbomParentQuery query, String userCode);
 
     Integer getSapErrorNum(String userCode);
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 2544b1bb..fa807188 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
@@ -2821,10 +2821,15 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         }
         if(CollUtil.isNotEmpty(delRowIds)){
             //转移后删除
-            this.getBaseMapper().delEBomHistory(delRowIds);
+            this.delEBomHistory(delRowIds);
         }
     }
 
+    public void  delEBomHistory(List<Long> parentRowIds){
+        this.getBaseMapper().delEBomHistory1(parentRowIds);
+        this.getBaseMapper().delEBomHistory2(parentRowIds);
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteBomV2(Long bomRowId) {
         BomNewEbomParentEntity parent = getById(bomRowId);
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 603a4e6d..6ccd5ee3 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
@@ -660,6 +660,19 @@
             #{parentRowId}
         </foreach>
     </insert>
+    <delete id="delEBomHistory1">
+        delete from t_bom_new_ebom_parent where row_id in
+        <foreach collection="parentRowIds" item="parentRowId" open="(" separator="," close=");">
+            #{parentRowId}
+        </foreach>
+    </delete>
+
+    <delete id="delEBomHistory2">
+        delete from t_bom_new_ebom_child where parent_row_id in
+        <foreach collection="parentRowIds" item="parentRowId" open="(" separator="," close=");">
+            #{parentRowId}
+        </foreach>
+    </delete>
 
     <delete id="delEBomHistory">
         delete from t_bom_new_ebom_parent where row_id in