From 14fa056416868e23544c30787f5ff0a3bc4a4ff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Fri, 23 Aug 2024 18:18:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=99=E6=A1=83=E4=BC=9A?=
 =?UTF-8?q?=E5=88=B01010=20=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=88=E6=B2=B9?=
 =?UTF-8?q?=E6=BC=86=E5=8C=85=E6=B2=A1parnent=E6=95=B0=E6=8D=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=89-=E6=B5=8B=E8=AF=95=E5=AE=8C=E5=86=8D?=
 =?UTF-8?q?=E5=8F=91=E7=94=9F=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/mapper/master/BomNewPbomChildMapper.java       | 2 ++
 .../product/bomnew/service/BomNewEbomParentService.java   | 3 +++
 .../bomnew/service/domain/EBom/EBomToPBomFor31.java       | 1 +
 .../bomnew/service/domain/EBom/EBomToPBomForFormal31.java | 1 +
 .../bomnew/service/domain/EBom/EBomToPbomBase.java        | 8 ++++++++
 .../resources/mapper/master/BomNewPbomChildMapper.xml     | 8 ++++++++
 6 files changed, 23 insertions(+)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomChildMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomChildMapper.java
index a13961e7..1322f04c 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomChildMapper.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomChildMapper.java
@@ -23,6 +23,8 @@ public interface BomNewPbomChildMapper extends BaseMapper<BomNewPbomChildEntity>
 
     void  delByParentRowId(@Param("parentRowId") Long parentRowId);
 
+    void batchDelByParentRowId(@Param("parentRowIds") List<Long> parentRowIds);
+
     void setProductionFactoryCode(@Param("productionFactoryCode")String productionFactoryCode, @Param("rowIds") List<Long> rowIds);
 
     List<BomNewPbomChildEntity> getChildrenByChildRowId(Long rowId);
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 c7232e98..14a983d5 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
@@ -1110,6 +1110,9 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             bomTree.add(parent);
             EBomToPbomBase eBomToPBom =parent.getMaterialNo().startsWith("31")?  new EBomToPBomForFormal31(parent, bomTree, paramDto.getFacCodes(), 0L,EnumUtils.getValueEnum(ConvertToPBomModelEnum.class,paramDto.getConvertMode())):new EBomToPBomForFormal(parent, bomTree, paramDto.getFacCodes(), 0L,EnumUtils.getValueEnum(ConvertToPBomModelEnum.class,paramDto.getConvertMode()));
             eBomToPBom.convert();
+//            if(CollUtil.isNotEmpty(eBomToPBom.getDelParentRowIds())){
+//                pBomChildService.getBaseMapper().batchDelByParentRowId(eBomToPBom.getDelParentRowIds());
+//            }
 
             if (CollUtil.isNotEmpty(eBomToPBom.getPBomParentResult())) {
                 pBomParentService.saveOrUpdateBatch(eBomToPBom.getPBomParentResult());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
index fe8e1683..1b328273 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
@@ -34,6 +34,7 @@ public class EBomToPBomFor31 extends EBomToPbomBase {
         this.convertMode = convertModelEnum;
 //        generateDrawingNo(allBomDetail, parentRowId, "");
         //初始化Ebom版本
+//        this.delParentRowIds.clear();
         initEBomVersion();
 
     }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java
index b0dbfadc..199623c6 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java
@@ -39,6 +39,7 @@ public class EBomToPBomForFormal31 extends EBomToPbomBase {
         this.facCodes = inFacCodes;
         this.convertMode=convertModelEnum;
 //        generateDrawingNo(allBomDetail, parentRowId, "");
+//        this.delParentRowIds.clear();
         initEBomVersionFormal();
 
     }
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 a7a32376..a92c4c1a 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
@@ -73,6 +73,10 @@ public abstract class EBomToPbomBase {
     @Getter
     private List<Long>  addEBomNew=new ArrayList<>();
 
+    //删除子表的父级行
+//    @Getter
+//    protected List<Long> delParentRowIds=new ArrayList<>();
+
     @Getter
 //    protected List<BomNewEbomUpdateDetailEntity> upgradeChangeDetailResult = new ArrayList<>();
 
@@ -181,6 +185,7 @@ public abstract class EBomToPbomBase {
             //if (oldParent.getCreatedBy().equals(parentVo.getCreatedBy())) {
                 if (ConvertToPBomModelEnum.OVERRIDE.equalsValue(convertMode.getValue())) {
                     SpringUtil.getBean(BomNewPbomChildService.class).getBaseMapper().deleteByMap(ImmutableMap.of("parent_row_id", oldParent.getRowId()));
+//                    this.delParentRowIds.add(oldParent.getRowId());
                     oldParent.setSourceRowId(parentVo.getBomRowId());
                     oldParent.setCreatedTime(LocalDateTime.now());
                     oldParent.setCreatedBy(SessionUtil.getUserCode());
@@ -861,6 +866,9 @@ public abstract class EBomToPbomBase {
     protected List<BomNewEbomParentVO> getResultAllSubIncludeSelf(BomNewEbomParentVO parentVO) {
         List<BomNewEbomParentVO> reusltSub = new ArrayList<>();
         reusltSub.add(parentVO);
+        if(parentVO.getBomRowId()<=0){
+            return reusltSub;
+        }
         getAllSubData(ImmutableList.of(parentVO.getBomRowId()), reusltSub);
 
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomChildMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomChildMapper.xml
index 9038b605..c4dd0571 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomChildMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomChildMapper.xml
@@ -63,6 +63,14 @@
         delete from t_bom_new_pbom_child where parent_row_id =#{parentRowId}
 
     </delete>
+
+    <delete id="batchDelByParentRowId">
+        delete from t_bom_new_pbom_child where parent_row_id in
+        <foreach collection="parentRowIds" item="item" index="index" open="(" separator="," close=")">
+           #{item}
+        </foreach>
+
+    </delete>
     
     <update id="setProductionFactoryCode">
         update t_bom_new_pbom_child set production_factory_code=#{productionFactoryCode}, set_production_factory_time=now() , production_factory_code_input_type=2