From be4d90159522a42579884e78bdbaad48a0564621 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Sun, 7 Jan 2024 18:13:26 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/mapper/master/BomNewMbomParentMapper.java      | 2 +-
 .../product/bomnew/service/BomNewMbomParentService.java   | 2 +-
 .../resources/mapper/master/BomNewMbomParentMapper.xml    | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java
index a688f008..3532d4c1 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java
@@ -44,7 +44,7 @@ public interface BomNewMbomParentMapper extends BaseMapper<BomNewMbomParentEntit
      * @param rowId
      * @return
      */
-    List<BomNewMbomMiddleVO> getParentChild(@Param("rowId")  Long rowId );
+    List<BomNewMbomMiddleVO> getParentChild(@Param("rowId")  Long rowId ,@Param("bomRowId")  Long bomRowId);
 
      BomNewMbomMiddleVO  getParentById(@Param("rowId")  Long rowId );
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java
index a92e9edc..061e446d 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java
@@ -106,7 +106,7 @@ public class BomNewMbomParentService extends ServiceImpl<BomNewMbomParentMapper,
         if (Objects.equals(dto.getRowId(), dto.getBomRowId())) {
             _rowId = 0l;
         }
-        List<BomNewMbomMiddleVO> listChild = this.getBaseMapper().getParentChild(_rowId);
+        List<BomNewMbomMiddleVO> listChild = this.getBaseMapper().getParentChild(_rowId,dto.getBomRowId());
         if (CollectionUtil.isNotEmpty(listChild)) {
             listChild.forEach(child -> {
                 IndexListTree.sysnParentParam(parent, child);
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml
index 143f317d..0e1ecd1f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml
@@ -62,6 +62,7 @@
         <if test="query.facCode!=null and query.facCode!=''">
             and fac_code=#{query.facCode}
         </if>
+
       
         <if test="query.status!=null and query.status==1">
             <if test="query.startDate!=null and query.startDate!='' and query.endDate!=null and query.endDate!=''">
@@ -112,6 +113,9 @@
                  left join t_bom_new_mbom_back_material as t2
                            on t1.row_id=t2.detail_row_id
         where t1.parent_row_id = #{rowId}
+        <if test="bomRowId!=null and bomRowId!=0">
+          and t1.bom_row_id=#{bomRowId}
+        </if>
         order by t1.order_number
     </select>
 
@@ -138,7 +142,9 @@
         on t1.bom_row_id=t2.row_id
         where t1.bom_row_id=t2.row_id  and t2.last_version_is=1
 
-
+        <if test="query.status!=null and query.status!=0">
+            and t2.status=#{query.status}
+        </if>
         <if test="query.facCode!=null and query.facCode!=''">
             and t1.fac_code=#{query.facCode}
         </if>