From b98cfb6157768626a1ba2f7d0cec4b4b7d639ce9 Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Sat, 23 Dec 2023 21:35:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/mapper/master/BomNewEbomParentMapper.java       | 2 ++
 .../product/bomnew/service/BomNewEbomParentService.java    | 4 ++++
 .../product/bomnew/service/domain/EBom/EBomToPBom.java     | 4 ++++
 .../resources/mapper/master/BomNewEbomParentMapper.xml     | 7 +++++++
 4 files changed, 17 insertions(+)

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 9c9b4b3b..ae6a654d 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
@@ -61,4 +61,6 @@ public interface BomNewEbomParentMapper extends BaseMapper<BomNewEbomParentEntit
     void  updateRootState();
 
     void delBatch(@Param("rowIds") List<Long> rowIds);
+
+    void  updateStateBatchByRowIds(@Param("status") Integer status, @Param("list") List<Long> list );
 }
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 73dce55a..d4714ab4 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
@@ -463,6 +463,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
             if (CollUtil.isNotEmpty(eBomToPBom.getPBomParentResult())) {
                 pBomParentService.saveOrUpdateBatch(eBomToPBom.getPBomParentResult());
+
             }
             if (CollUtil.isNotEmpty(eBomToPBom.getPBomChildResult())) {
                 pBomChildService.saveOrUpdateBatch(eBomToPBom.getPBomChildResult());
@@ -473,6 +474,9 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             if(CollUtil.isNotEmpty(eBomToPBom.getUpgradeChangeResult())){
                 upgradeChangeService.saveOrUpdateBatch(eBomToPBom.getUpgradeChangeResult());
             };
+            if(CollUtil.isNotEmpty(eBomToPBom.getHasConvertEBomRowIds())){
+                this.getBaseMapper().updateStateBatchByRowIds(EBomStatusEnum.PUBLISHED.getValue(),eBomToPBom.getHasConvertEBomRowIds());
+            }
 
 
         }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
index c5924ea6..7a03dfae 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
@@ -59,6 +59,9 @@ public class EBomToPBom {
     @Getter
     private List<BomNewEbomUpgradeChangeEntity> upgradeChangeResult = new ArrayList<>();
 
+    @Getter
+    private  List<Long> hasConvertEBomRowIds=new ArrayList<>();
+
 
     private Map<String, String> generateDrawingNoMap = new HashMap<>();
 
@@ -124,6 +127,7 @@ public class EBomToPBom {
                 .eq(BomNewPbomParentEntity::getMaterialNo, parentVo.getMaterialNo())
                 .eq(BomNewPbomParentEntity::getFacCode, facCode).one();
 
+        this.hasConvertEBomRowIds.add(parentVo.getRowId());
         if (Objects.nonNull(oldParent) && !EBomStatusEnum.PUBLISHED.equalsValue(oldParent.getStatus())) {
             SpringUtil.getBean(BomNewPbomChildService.class).getBaseMapper().deleteByMap(ImmutableMap.of("parent_row_id", oldParent.getRowId()));
             oldParent.setCurrentVersion(parentVo.getCurrentVersion());
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 76e6b4ec..b7f70961 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
@@ -207,6 +207,13 @@
         </foreach>;
     </delete>
 
+    <update id="updateStateBatchByRowIds">
+        update t_bom_new_ebom_parent set status=#{status} where row_id in
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+
 
 
 </mapper>