From 2b6cb45fcdf8d66f6f74b9bc381eb58e7379e211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Sat, 25 Nov 2023 20:20:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E5=A7=8BBOM=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/mapper/master/BomOriginalPlmParentMapper.java  | 5 +++++
 .../bomnew/service/BomNewOriginalParentService.java       | 8 ++++++++
 .../domain/OriginalBom/PlmBomToOriginalConvert.java       | 1 +
 .../mapper/master/BomOriginalPlmParentMapper.xml          | 7 +++++++
 4 files changed, 21 insertions(+)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomOriginalPlmParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomOriginalPlmParentMapper.java
index d758db4e..fbc30509 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomOriginalPlmParentMapper.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomOriginalPlmParentMapper.java
@@ -2,9 +2,12 @@ package com.nflg.product.bomnew.mapper.master;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.nflg.product.bomnew.pojo.entity.BomOriginalPlmParentEntity;
+import io.swagger.v3.oas.models.security.SecurityScheme;
 import lombok.AllArgsConstructor;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * t_bom_original_plm_parent 表数据库访问层
  * 原始BOM临时表（父表）
@@ -15,4 +18,6 @@ import org.apache.ibatis.annotations.Param;
 public interface BomOriginalPlmParentMapper extends BaseMapper<BomOriginalPlmParentEntity> {
 
     void clearPlmBom(@Param("id") Integer id);
+
+    void delChildByParentRowIds(@Param("rowIds")List<Integer> rowIds);
 }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
index ca71131c..e4487dba 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
@@ -232,6 +232,7 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
         for (BomOriginalPlmParentEntity parent : parents) {
             //转原始BOM
             convert.convertOriginalBom(parent);
+            
         }
 
         if (CollUtil.isNotEmpty(convert.getResultParent())) {
@@ -240,6 +241,13 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
         if (CollUtil.isNotEmpty(convert.getResultChild())) {
             originalChildService.saveOrUpdateBatch(convert.getResultChild());
         }
+        //删除plm临时表数据
+        List<Integer> delRowIds = parents.stream().map(u -> u.getRowId()).collect(Collectors.toList());
+        if(CollUtil.isNotEmpty(delRowIds)) {
+            originalPlmParentService.getBaseMapper().deleteBatchIds(delRowIds);
+            originalPlmParentService.getBaseMapper().delChildByParentRowIds(delRowIds);
+        }
+        
     }
 
     /**
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java
index 45643232..bb0de122 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java
@@ -36,6 +36,7 @@ public class PlmBomToOriginalConvert extends BaseConvert {
     List<BomOriginalPlmBomVO> data = new ArrayList<>();
 
 
+
     /**
      * 转原始BOM
      */
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomOriginalPlmParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomOriginalPlmParentMapper.xml
index cb0409d5..3f96e9db 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomOriginalPlmParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomOriginalPlmParentMapper.xml
@@ -33,4 +33,11 @@
         update t_bom_original_plm_parent set status=2 where row_id=#{rowId};
         update t_bom_original_plm_child set status=2 where parent_row_id=#{rowId};
     </update>
+
+    <delete id="delChildByParentRowIds">
+        delete from t_bom_original_plm_child where parent_row_id in
+        <foreach collection="rowIds" item="rowId" open="(" separator="," close=")">
+            #{rowId}
+        </foreach>
+    </delete>
 </mapper>