From bd41892bbc1076a1e8db988f0f097b7356260308 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Sat, 6 Jul 2024 17:56:01 +0800
Subject: [PATCH] =?UTF-8?q?+=E6=AD=A3=E5=BC=8F=E7=89=88=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/domain/EBom/EBomForwardReport.java      | 2 ++
 .../bomnew/service/domain/PBom/PBomFormalTreeTask.java     | 4 ++++
 .../bomnew/service/domain/PBom/PBomForwardReport.java      | 7 ++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
index 558189c3..6cba29ac 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
@@ -10,6 +10,7 @@ import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.ImmutableList;
 import com.nflg.product.bomnew.constant.EBomConstant;
+import com.nflg.product.bomnew.constant.EBomStatusEnum;
 import com.nflg.product.bomnew.constant.OriginalConstant;
 import com.nflg.product.bomnew.constant.ReportConstant;
 import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
@@ -105,6 +106,7 @@ public class EBomForwardReport extends BaseForwardReport {
         if (isNewVersion()) {
             QueryWrapper<BomNewEbomParentEntity> queryWrapper = new QueryWrapper<>();
             buildQueryParam(queryWrapper);
+            queryWrapper .eq(FieldGetterUtil.getFieldInfo(BomNewEbomParentEntity::getStatus), EBomStatusEnum.PUBLISHED.getValue());
             List<BomNewEbomParentEntity> list = SpringUtil.getBean(BomNewEbomParentService.class).list(queryWrapper);
             rlist = Convert.convert(new TypeReference<List<BomNewEbomParentVO>>() {
             }, list);
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java
index 0563b3f0..a58be260 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java
@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.nflg.product.bomnew.constant.EBomConstant;
 import com.nflg.product.bomnew.constant.OriginalConstant;
+import com.nflg.product.bomnew.constant.PBomStatusEnum;
 import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentFormalEntity;
 import com.nflg.product.bomnew.pojo.entity.BomNewPbomChildEntity;
 import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity;
@@ -82,6 +83,9 @@ public class PBomFormalTreeTask extends RecursiveTask<List<BomNewPbomParentVO>>
 
             List<BomNewPbomParentEntity> childBomlist = SpringUtil.getBean(BomNewPbomParentService.class).lambdaQuery()
                     .in(BomNewPbomParentEntity::getMaterialNo, materialNos)
+
+                    .ge( BomNewPbomParentEntity::getStatus, PBomStatusEnum.PUBLISH.getValue())
+
                     .eq(BomNewPbomParentEntity::getFacCode, facCode).list();
           Map<String, BomNewPbomParentEntity> parentMap = childBomlist.stream()
                     .collect(Collectors.groupingBy(
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java
index dba4ed5b..636da046 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.ImmutableList;
 import com.nflg.product.bomnew.constant.EBomConstant;
 import com.nflg.product.bomnew.constant.OriginalConstant;
+import com.nflg.product.bomnew.constant.PBomStatusEnum;
 import com.nflg.product.bomnew.constant.ReportConstant;
 import com.nflg.product.bomnew.mapper.master.BomNewPbomParentMapper;
 import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
@@ -159,7 +160,11 @@ public class PBomForwardReport  extends BaseForwardReport {
         if (isNewVersion()) {
             QueryWrapper<BomNewPbomParentEntity> queryWrapper = new QueryWrapper<>();
             buildQueryParam(queryWrapper);
-            List<BomNewPbomParentEntity> list = SpringUtil.getBean(BomNewPbomParentService.class).list(queryWrapper);
+
+            queryWrapper.ge( FieldGetterUtil.getFieldInfo(BomNewPbomParentEntity::getStatus), PBomStatusEnum.PUBLISH.getValue());
+
+            List<BomNewPbomParentEntity> list = SpringUtil.getBean(BomNewPbomParentService.class)
+                    .list(queryWrapper);
             rlist = Convert.convert(new TypeReference<List<BomNewPbomParentVO>>() {
             }, list);
         } else {