From b5a694ae5fd6313d232efc51e8352110eced581e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Fri, 28 Jun 2024 14:49:25 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9B=BF=E6=8D=A2=E8=8D=89=E7=A8=BF?=
 =?UTF-8?q?=E6=80=81=E7=9A=84=E8=99=9A=E6=8B=9F=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/BomNewEbomUpgradeChangeService.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 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 e324b207..ceb3ce4f 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,16 +84,18 @@ 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.getOldPBomList())) {
-                List<Long> oldPBomRowIds = updateImpact.getOldPBomList().stream().map(u -> u.getRowId()).collect(Collectors.toList());
-                pbomParentService.getBaseMapper().insertPBomParentToFormal(oldPBomRowIds);
-                pbomParentService.getBaseMapper().insertPBomChildToFormal(oldPBomRowIds);
-                pbomParentService.getBaseMapper().delPBom(oldPBomRowIds);
+                List<Long> oldPbomRowIds = updateImpact.getOldPBomList().stream().map(u -> u.getRowId()).collect(Collectors.toList());
+                pbomParentService.getBaseMapper().delPBom(oldPbomRowIds);
             }
         }
     }