From 1a459a6057924b54f9678f7f8b9c90fbe2e02799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Sat, 15 Jun 2024 17:44:23 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81ebom,pbom=20=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=9D=E5=AD=98=E6=89=80=E6=9C=89=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E7=89=88=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/BomNewEbomParentService.java       | 11 +++++++----
 .../bomnew/service/BomNewPbomParentService.java       |  7 +++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

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 dd92a0d8..7ed66be7 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
@@ -913,7 +913,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                     ebomChildService.getBaseMapper().delBomChild(delParentBom);
                 }
             }
-            //需修改正式版版本的BOM
+            //需修改正式版BOM的版本
             List<BomNewEbomParentVO> upVersionEBomParents = bomTree.stream().filter(u -> u.getHasChangeState().equals(2)).collect(Collectors.toList());
             if(CollUtil.isNotEmpty(upVersionEBomParents)){
                 List<BomNewEbomParentEntity> upVersionList=new ArrayList<>();
@@ -2492,7 +2492,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
 
     /**
-     * ebom发布时将历史正式版-移到正式表
+     * ebom发布时将历史正式版-移到正式表(所有正式数据都会移到formal正式表中)
      * @param exceptRowIds
      */
     private void eBomToFormal(List<Long> exceptRowIds, List<BomNewEbomParentVO> parents){
@@ -2502,8 +2502,11 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         if(CollUtil.isNotEmpty(toParents)) {
 
             List<Long> childParentRowIds = toParents.stream().map(u -> u.getRowId()).collect(Collectors.toList());
-            this.getBaseMapper().insertEBomFormalParent(childParentRowIds);
-            this.getBaseMapper().insertEBomFormalChild(childParentRowIds);
+            List<Long> toFormalRowIds =  new ArrayList<>();
+            toFormalRowIds.addAll(exceptRowIds);
+            toFormalRowIds.addAll(childParentRowIds);
+            this.getBaseMapper().insertEBomFormalParent(toFormalRowIds);
+            this.getBaseMapper().insertEBomFormalChild(toFormalRowIds);
 
             //转移后删除
             this.getBaseMapper().delEBomHistory(childParentRowIds);
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index ea8b213f..467007f1 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -1210,8 +1210,11 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
         if(CollUtil.isNotEmpty(toParents)) {
 
             List<Long> oldPBomRowIds = toParents.stream().map(u -> u.getRowId()).collect(Collectors.toList());
-            this.getBaseMapper().insertPBomParentToFormal(oldPBomRowIds);
-            this.getBaseMapper().insertPBomChildToFormal(oldPBomRowIds);
+            List<Long> toFormalPBomRowIds = new ArrayList<>();
+            toFormalPBomRowIds.addAll(exceptRowIds);
+            toFormalPBomRowIds.addAll(oldPBomRowIds);
+            this.getBaseMapper().insertPBomParentToFormal(toFormalPBomRowIds);
+            this.getBaseMapper().insertPBomChildToFormal(toFormalPBomRowIds);
 
             //转移后删除
             this.getBaseMapper().delPBom(oldPBomRowIds);