From f600d1fe2eaf72b0d30ac5227b7838f1b0c18afa 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 16:52:36 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8Dt=5Fbom=5Fnew=5Febo?=
 =?UTF-8?q?m=5Fchild=5Fformal=E7=9A=84bom=5Fversion=5Frow=5Fid=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=B2=A1=E6=9C=89=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewEbomParentService.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 4bc075b6..ae27e893 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
@@ -1004,8 +1004,6 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             //List<Long> bomRowIds = bomTree.stream().filter(u ->!EBomStatusEnum.PUBLISHED.equalsValue(u.getStatus()) && u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList());
             if (CollUtil.isNotEmpty(eBomToPBom.getAddEBomNew())) {
                 this.getBaseMapper().updateStateBatchByRowIds(EBomStatusEnum.PUBLISHED.getValue(), eBomToPBom.getAddEBomNew());
-                //将历史已发布版-转移到正式历史表
-                eBomToFormal(eBomToPBom.getAddEBomNew(), eBomToPBom.getDelOldEBom() );
             }
             //替换需覆盖的受影响的虚拟包
             if(CollUtil.isNotEmpty(eBomToPBom.getUpgradeChangeResultForCover())){
@@ -1025,6 +1023,10 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             if (CollUtil.isNotEmpty(bomChildren)) {
                 ebomChildService.updateBatchById(bomChildren);
             }
+            //将历史已发布版-转移到正式历史表
+            if (CollUtil.isNotEmpty(eBomToPBom.getAddEBomNew())) {
+                eBomToFormal(eBomToPBom.getAddEBomNew(), eBomToPBom.getDelOldEBom() );
+            }
 
 //            SpringUtil.getBean(BomNewEbomParentFormalService.class).copyEbomFormal(bomRowId);
         }