From 45f0c9a3ae7faa2dc211715920811672ccacdfe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Sat, 29 Jun 2024 14:51:46 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=BD=ACPBOM-ROWid=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewEbomUpgradeChangeService.java      | 12 +++++++-----
 .../service/domain/EBom/ChangeImpactUpgrade.java     |  9 +++++----
 .../bomnew/service/domain/EBom/EBomToPbomBase.java   |  2 ++
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomUpgradeChangeService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomUpgradeChangeService.java
index ceb3ce4f..7faaa403 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomUpgradeChangeService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomUpgradeChangeService.java
@@ -84,15 +84,17 @@ public class BomNewEbomUpgradeChangeService extends ServiceImpl<BomNewEbomUpgrad
 
             if (CollUtil.isNotEmpty(updateImpact.getPBomParentResult())) {
                 pbomParentService.saveOrUpdateBatch(updateImpact.getPBomParentResult());
-                //新加的移到历史表
-                List<Long> newPBomRowIds = updateImpact.getPBomParentResult().stream().map(u -> u.getRowId()).collect(Collectors.toList());
-                pbomParentService.getBaseMapper().insertPBomParentToFormal(newPBomRowIds);
-                pbomParentService.getBaseMapper().insertPBomChildToFormal(newPBomRowIds);
+
             }
             if (CollUtil.isNotEmpty(updateImpact.getPBomChildResult())) {
                 pbomChildService.saveOrUpdateBatch(updateImpact.getPBomChildResult());
             }
-            //旧版PBOM移动到历史表中
+            //新加的移到历史表
+            if(CollUtil.isNotEmpty(updateImpact.getNewAddPBomParentResult())){
+                pbomParentService.getBaseMapper().insertPBomParentToFormal(updateImpact.getNewAddPBomParentResult());
+                pbomParentService.getBaseMapper().insertPBomChildToFormal(updateImpact.getNewAddPBomParentResult());
+            }
+            //删除旧版PBOM移动到历史表中
             if (CollUtil.isNotEmpty(updateImpact.getOldPBomList())) {
                 List<Long> oldPbomRowIds = updateImpact.getOldPBomList().stream().map(u -> u.getRowId()).collect(Collectors.toList());
                 pbomParentService.getBaseMapper().delPBom(oldPbomRowIds);
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/ChangeImpactUpgrade.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/ChangeImpactUpgrade.java
index fd2f8286..ae252edb 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/ChangeImpactUpgrade.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/ChangeImpactUpgrade.java
@@ -6,11 +6,12 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
 import com.nflg.product.base.core.conmon.util.SessionUtil;
-import com.nflg.product.bomnew.constant.*;
+import com.nflg.product.bomnew.constant.EBomStatusEnum;
+import com.nflg.product.bomnew.constant.PBomEditStatusEnum;
+import com.nflg.product.bomnew.constant.PBomStatusEnum;
+import com.nflg.product.bomnew.constant.VirtualPackageTypeEnum;
 import com.nflg.product.bomnew.pojo.entity.BomNewPbomChildEntity;
 import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity;
 import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
@@ -18,7 +19,6 @@ import com.nflg.product.bomnew.service.BomNewPbomChildService;
 import com.nflg.product.bomnew.service.BomNewPbomParentService;
 import com.nflg.product.bomnew.util.BomLevelUtil;
 import com.nflg.product.bomnew.util.VersionUtil;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 
 import java.math.BigDecimal;
@@ -172,6 +172,7 @@ public class ChangeImpactUpgrade extends EBomToPbomBase {
 
         }
         this.pBomParentResult.add(pBomParent);
+        this.newAddPBomParentResult.add(pBomParent.getRowId());
         return pBomParent;
     }
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
index 5f6a98e1..9167facd 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
@@ -48,6 +48,8 @@ public abstract class EBomToPbomBase {
     @Getter
     protected List<BomNewPbomParentEntity> pBomParentResult = new ArrayList<>();
 
+    @Getter
+    protected List<Long> newAddPBomParentResult = new ArrayList<>();
     @Getter
     protected List<BomNewPbomChildEntity> pBomChildResult = new ArrayList<>();