From 72eb9aa4397d0e21e98f85faa1851d8920bca66d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Fri, 15 Mar 2024 18:51:38 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81315=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/master/BomNewEbomParentMapper.java |  4 ++--
 .../service/BomNewEbomParentService.java      |  4 ++--
 .../mapper/master/BomNewEbomParentMapper.xml  | 19 +++++++++++++++++--
 3 files changed, 21 insertions(+), 6 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 051e0840..83798aae 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,9 +54,9 @@ public interface BomNewEbomParentMapper extends BaseMapper<BomNewEbomParentEntit
 
     Set<String> getSelfParentMaterialNo(@Param("createdBy") String createdBy ,@Param("list") Set<String> list);
 
-    List<BomNewEbomParentVO> getParentForMaterialNoSeach(@Param("materialNoList") List<String> materialNoList);
+    List<BomNewEbomParentVO> getParentForMaterialNoSeach(@Param("materialNoList") List<String> materialNoList ,@Param("dataType") Integer dataType);
 
-    List<BomNewEbomParentVO> getChildForMaterialNoSeach(@Param("materialNoList") List<String> materialNoList,@Param("materialNo") String materialNo);
+    List<BomNewEbomParentVO> getChildForMaterialNoSeach(@Param("materialNoList") List<String> materialNoList,@Param("materialNo") String materialNo,@Param("dataType") Integer dataType );
 
     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 ec5263c4..b228500f 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
@@ -117,8 +117,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 List<String> parentMaterialByMaterialNo = getParentMaterialByMaterialNo(materialNo, !userRoleService.technician()).stream().collect(Collectors.toList());
                 parentMaterialByMaterialNo.add(materialNo);
                 if (CollUtil.isNotEmpty(parentMaterialByMaterialNo)) {
-                    List<BomNewEbomParentVO> parents = this.getBaseMapper().getParentForMaterialNoSeach(parentMaterialByMaterialNo);
-                    List<BomNewEbomParentVO> childs = this.getBaseMapper().getChildForMaterialNoSeach(parentMaterialByMaterialNo, materialNo);
+                    List<BomNewEbomParentVO> parents = this.getBaseMapper().getParentForMaterialNoSeach(parentMaterialByMaterialNo, query.getDataType());
+                    List<BomNewEbomParentVO> childs = this.getBaseMapper().getChildForMaterialNoSeach(parentMaterialByMaterialNo, materialNo,query.getDataType());
                     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 a77d4064..cec59609 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
@@ -95,7 +95,15 @@
     <!--物料编码搜索-父级-->
     <select id="getParentForMaterialNoSeach" resultType="com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO">
         SELECT 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 and a.status &lt; 4 and   material_no in
+        FROM t_bom_new_ebom_parent a 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   material_no in
         <foreach collection="materialNoList" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -108,7 +116,14 @@
         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 and  a.status &lt; 4 and ( b.material_no in
+        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
         <foreach collection="materialNoList" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>