From 8719140089c4e845f6fabe88b1df140a5ce84377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Tue, 4 Jun 2024 17:33:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(ebom):=20=E5=B7=A5=E4=BD=9C=E8=A1=A8?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=97=B6=E5=8F=AA=E6=90=9C=E7=B4=A2=E8=8D=89?=
 =?UTF-8?q?=E7=A8=BF=E6=95=B0=E6=8D=AE?=
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     | 2 +-
 .../main/resources/mapper/master/BomNewEbomParentMapper.xml | 6 ++++++
 3 files changed, 8 insertions(+), 2 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 77cf2477..e2991942 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
@@ -86,7 +86,7 @@ public interface BomNewEbomParentMapper extends BaseMapper<BomNewEbomParentEntit
 
     List<BomNewEbomParentVO> getChildren(Long bomRowId, int type);
 
-    List<BomNewEbomParentVO> getBom(String materialNo, String drawingNo);
+    List<BomNewEbomParentVO> getBom(Integer state, String materialNo, String drawingNo);
 
     List<BomNewEbomParentVO> getVOById(Long parentRowId);
 
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 29355798..d3aeb713 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
@@ -2241,7 +2241,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 .collect(Collectors.toList());
         roots.forEach(this::buildChildren);
         //从子级开始查找
-        List<BomNewEbomParentVO> boms = this.getBaseMapper().getBom(query.getMaterialNo(), query.getDrawingNo());
+        List<BomNewEbomParentVO> boms = this.getBaseMapper().getBom(0, query.getMaterialNo(), query.getDrawingNo());
         boms.removeIf(c -> Objects.equals(c.getLastVersionIs(), 0) || Objects.equals(c.getStatus(), EBomStatusEnum.PUBLISHED.getValue()));
         boms.forEach(this::buildChildren);
         roots.addAll(boms.stream().filter(b -> b.getRootIs() == 0 && b.getUserRootIs() == 0 && b.getRootIsForWaitReview() == 0).map(this::buildParent).flatMap(List::stream).collect(Collectors.toList()));
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 cd42cfff..c46a8458 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
@@ -464,6 +464,12 @@
             <if test="drawingNo!=null and drawingNo!=''">
                 AND b.drawing_no = #{drawingNo}
             </if>
+            <if test="state==0">
+                AND a.status &lt; 4
+            </if>
+            <if test="state==1">
+                AND a.status = 4
+            </if>
         </where>
         ORDER BY b.order_number
     </select>