From 70faa04f0066cbb9846c37c9068294b847902dd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Wed, 29 May 2024 10:17:40 +0800
Subject: [PATCH] =?UTF-8?q?optimize(ebom):=20=E5=88=A0=E9=99=A4=E6=97=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0last=5Fversion=5Fis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/master/BomNewEbomParentMapper.java  |  2 ++
 .../service/BomNewEbomParentService.java       | 18 +++++++++++++-----
 .../mapper/master/BomNewEbomParentMapper.xml   | 10 ++++++++++
 3 files changed, 25 insertions(+), 5 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 5f3ec803..1e2af723 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
@@ -104,4 +104,6 @@ public interface BomNewEbomParentMapper extends BaseMapper<BomNewEbomParentEntit
     void delEBomHistory(@Param("parentRowIds") List<Long> parentRowIds);
 
     List<BomNewEbomParentEntity> getLatestByMaterialNo(Collection<String> materialNos);
+
+    void updateLastVersionIs();
 }
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 a6d0d7ac..25c636c8 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
@@ -2572,10 +2572,15 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         VUtils.isTure(!StrUtil.equals(root.getCreatedBy(), SessionUtil.getUserCode())).throwMessage("不能删除他人的数据");
 
         delete(root.getRowId());
+
+        CompletableFuture.runAsync(this::updateLastVersionIs);
         return true;
     }
 
     private void delete(Long bomRowId) {
+        this.getBaseMapper().delete(Wrappers.lambdaQuery(BomNewEbomParentEntity.class)
+                .eq(BomNewEbomParentEntity::getRowId, bomRowId));
+
         Set<String> materialNos = ebomChildService.lambdaQuery()
                 .select(BomNewEbomChildEntity::getMaterialNo)
                 .eq(BomNewEbomChildEntity::getParentRowId, bomRowId)
@@ -2583,6 +2588,10 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 .stream()
                 .map(BomNewEbomChildEntity::getMaterialNo)
                 .collect(Collectors.toSet());
+
+        ebomChildService.getBaseMapper().delete(Wrappers.lambdaQuery(BomNewEbomChildEntity.class)
+                .eq(BomNewEbomChildEntity::getParentRowId, bomRowId));
+
         if (CollUtil.isEmpty(materialNos)) return;
 
         List<BomNewEbomParentEntity> parents = lambdaQuery()
@@ -2599,11 +2608,6 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                         || Objects.equals(p.getVirtualPackageIs(), 1))
                 .map(BomNewEbomParentEntity::getRowId)
                 .collect(Collectors.toList());
-
-        ebomChildService.getBaseMapper().delete(Wrappers.lambdaQuery(BomNewEbomChildEntity.class)
-                .eq(BomNewEbomChildEntity::getParentRowId, bomRowId));
-        this.getBaseMapper().delete(Wrappers.lambdaQuery(BomNewEbomParentEntity.class)
-                .eq(BomNewEbomParentEntity::getRowId, bomRowId));
         //将自己手动创建的bom提为用户顶层
         List<Long> updateParents = parents.stream()
                 .filter(p -> StrUtil.equals(p.getCreatedBy(), SessionUtil.getUserCode()))
@@ -2619,4 +2623,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
         deleteParents.forEach(this::delete);
     }
+
+    private void updateLastVersionIs() {
+        this.getBaseMapper().updateLastVersionIs();
+    }
 }
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 2fe435d4..a350af47 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
@@ -314,6 +314,16 @@
             #{item}
         </foreach>
     </update>
+    <update id="updateLastVersionIs">
+        UPDATE t_bom_new_ebom_parent
+        SET last_version_is=0;
+        UPDATE t_bom_new_ebom_parent p1
+            INNER JOIN (SELECT material_no, MAX(current_version) current_version
+                        FROM t_bom_new_ebom_parent
+                        GROUP BY material_no) p2 ON p1.material_no = p2.material_no AND
+                                                    p1.current_version = p2.current_version
+        SET p1.last_version_is=1;
+    </update>
 
 
     <!--检查是否已发布数据的跟节点-->