From 840de12bfe33633bcc0c1103a2ad238c1ffe4e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Sat, 13 Apr 2024 16:01:35 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/master/BomNewEbomParentMapper.java |  2 +-
 .../service/BomNewEbomParentService.java      |  2 +-
 .../mapper/master/BomNewEbomParentMapper.xml  | 92 +++++++++++++------
 3 files changed, 68 insertions(+), 28 deletions(-)

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 56469841..c37a2de2 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
@@ -54,7 +54,7 @@ public interface BomNewEbomParentMapper extends BaseMapper<BomNewEbomParentEntit
 
     List<BomNewEbomParentVO> getParentForMaterialNoSeach(@Param("materialNoList") List<String> materialNoList ,@Param("dataType") Integer dataType);
 
-    List<BomNewEbomParentVO> getChildForMaterialNoSeach(@Param("materialNoList") List<String> materialNoList,@Param("materialNo") String materialNo,@Param("dataType") Integer dataType );
+    List<BomNewEbomParentVO> getChildForMaterialNoSeach(@Param("materialNoList") List<String> materialNoList,@Param("bomRowIds") Collection<Long> bomRowIds );
 
     void  updateRootState();
 
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 f3c0e6c8..35c25374 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
@@ -131,7 +131,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 materialNos.addAll(parentMaterialByMaterialNo);
                 if (CollUtil.isNotEmpty(materialNos)) {
                     List<BomNewEbomParentVO> parents = this.getBaseMapper().getParentForMaterialNoSeach(materialNos, query.getDataType());
-                    List<BomNewEbomParentVO> childs = this.getBaseMapper().getChildForMaterialNoSeach(materialNos, materialNo, query.getDataType());
+                    List<BomNewEbomParentVO> childs = this.getBaseMapper().getChildForMaterialNoSeach(materialNos, parents.stream().map(u->u.getRowId()).collect(Collectors.toSet()));
                     List<BomNewEbomParentVO> data = new ArrayList<>();
                     data.addAll(parents);
                     data.addAll(childs);
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 01e33ebc..04a17b65 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
@@ -98,40 +98,80 @@
 
     <!--物料编码搜索-父级-->
     <select id="getParentForMaterialNoSeach" resultType="com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO">
-        SELECT if(status=4 and #{dataType}!=1, 99,status) status, created_by as bomCreatedBy , row_id as bomRowId, row_id as childBomRowId, a.*
-        FROM t_bom_new_ebom_parent a where a.last_version_is=1
-<!--        <if test="dataType!=1 and !hasParentIs" >-->
+        SELECT   status  ,  created_by as bomCreatedBy , row_id as bomRowId, row_id as childBomRowId, a.*
+        FROM t_bom_new_ebom_parent a
+        join (select material_no,max(current_version) current_version from  t_bom_new_ebom_parent  where
+        <if test="dataType==1" >
+            a.status = 4
+        </if>
+        <if test="dataType==0" >
+            and  a.status   &lt; 4
+        </if>
+        and material_no in
+        <foreach collection="materialNoList" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        group by  material_no ) b on a.material_no=b.material_no and  a.current_version=b.current_version
+
+    </select>
+
+<!--    &lt;!&ndash;物料编码搜索-父级&ndash;&gt;-->
+<!--    <select id="getParentForMaterialNoSeach" resultType="com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO">-->
+<!--        SELECT if(status=4 and #{dataType}!=1, 99,status) status, created_by as bomCreatedBy , row_id as bomRowId, row_id as childBomRowId, a.*-->
+<!--        FROM t_bom_new_ebom_parent a where a.last_version_is=1-->
+<!--&lt;!&ndash;        <if test="dataType!=1 and !hasParentIs" >&ndash;&gt;-->
+<!--&lt;!&ndash;            and  a.status  &lt; 4&ndash;&gt;-->
+<!--&lt;!&ndash;        </if>&ndash;&gt;-->
+<!--        <if test="dataType==1">-->
+<!--            and  a.status = 4-->
+<!--        </if>-->
+
+<!--       and   material_no in-->
+<!--        <foreach collection="materialNoList" item="item" open="(" separator="," close=")">-->
+<!--            #{item}-->
+<!--        </foreach>-->
+<!--    </select>-->
+    <!--物料编码搜索-子级-->
+<!--    <select id="getChildForMaterialNoSeach" resultType="com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO">-->
+<!--        select if(#{dataType}!=1 and c.status=4,99,c.status) as status ,c.current_version , c.created_by as bomCreatedBy-->
+<!--        ,c.devise_name,c.devise_user_code,c.dept_name ,-->
+<!--        c.source, if(c.row_id is null,0,c.row_id) as bomRowId, c.row_id as childBomRowId, b.*-->
+<!--        from t_bom_new_ebom_parent a-->
+<!--        join t_bom_new_ebom_child b on a.row_id =b.parent_row_id-->
+<!--        left join t_bom_new_ebom_parent c on b.material_no=c.material_no and c.last_version_is=1-->
+<!--        where a.last_version_is=1-->
+<!--        <if test="dataType!=1">-->
 <!--            and  a.status  &lt; 4-->
 <!--        </if>-->
-        <if test="dataType==1">
-            and  a.status = 4
-        </if>
+<!--        <if test="dataType==1">-->
+<!--            and  a.status = 4-->
+<!--        </if>-->
+<!--        and ( b.material_no in-->
+<!--        <foreach collection="materialNoList" item="item" open="(" separator="," close=")">-->
+<!--            #{item}-->
+<!--        </foreach>-->
+<!--        or b.material_no=#{materialNo})-->
+<!--    </select>-->
 
-       and   material_no in
-        <foreach collection="materialNoList" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
-    </select>
     <!--物料编码搜索-子级-->
     <select id="getChildForMaterialNoSeach" resultType="com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO">
-        select if(#{dataType}!=1 and c.status=4,99,c.status) as status ,c.current_version , c.created_by as bomCreatedBy
-        ,c.devise_name,c.devise_user_code,c.dept_name ,
-        c.source, if(c.row_id is null,0,c.row_id) as bomRowId, c.row_id as childBomRowId, b.*
-        from t_bom_new_ebom_parent a
-        join t_bom_new_ebom_child b on a.row_id =b.parent_row_id
-        left join t_bom_new_ebom_parent c on b.material_no=c.material_no and c.last_version_is=1
-        where a.last_version_is=1
-        <if test="dataType!=1">
-            and  a.status  &lt; 4
-        </if>
-        <if test="dataType==1">
-            and  a.status = 4
-        </if>
-        and ( b.material_no in
+        select a.status  ,a.current_version , a.created_by as bomCreatedBy,
+        a.devise_name ,a.devise_user_code
+        ,a.dept_name,a.source,ifnull( a.row_id,0) as bomRowId
+        ,ifnull( a.row_id,0) as childBomRowId, b.* from  t_bom_new_ebom_child  b
+        left join  t_bom_new_ebom_parent a  on  a.material_no=b.material_no and a.row_id in
+        <foreach collection="bomRowIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        where  b.parent_row_id in
+        <foreach collection="bomRowIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and    b.material_no in
         <foreach collection="materialNoList" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
-        or b.material_no=#{materialNo})
+
     </select>
 
     <!--BOM-正式工作表-->