From 7ec1387c85fe52de7dba03c10d8a5711c3e22dec Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Fri, 5 Jul 2024 21:18:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=97=A0=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/PBom/PBomForwardReport.java        | 68 +++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

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 6bbd51e0..dba4ed5b 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
@@ -78,32 +78,32 @@ public class PBomForwardReport  extends BaseForwardReport {
     }
 
 
-    QueryWrapper<BomNewPbomParentFormalEntity> buildQuery() {
-        QueryWrapper<BomNewPbomParentFormalEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getMaterialNo, query.getMaterialNo());
-
-        if (StrUtil.isNotBlank(query.getDrawingNo())) {
-            queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getDrawingNo, query.getDrawingNo());
-        }
-
-        if (StrUtil.isNotBlank(query.getFacCode())) {
-            queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getFacCode, query.getFacCode());
-        }
-
-        if (query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.NEW.getValue()) == 0) {
-            queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getCurrentVersion, getMaxVersion());
-        } else if (query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.DEFINE.getValue() ) == 0){
-            queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getCurrentVersion, query.getBomVersion());
-        }
-
-        if (StrUtil.isNotBlank(query.getStartDate()) && StrUtil.isNotBlank(query.getEndDate())) {
-
-            queryWrapper.lambda().ge(BomNewPbomParentFormalEntity::getCreatedTime, query.getStartDate())
-                    .le(BomNewPbomParentFormalEntity::getReleaseTime, query.getEndDate());
-
-        }
-        return queryWrapper;
-    }
+//    QueryWrapper<BomNewPbomParentFormalEntity> buildQuery() {
+//        QueryWrapper<BomNewPbomParentFormalEntity> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getMaterialNo, query.getMaterialNo());
+//
+//        if (StrUtil.isNotBlank(query.getDrawingNo())) {
+//            queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getDrawingNo, query.getDrawingNo());
+//        }
+//
+//        if (StrUtil.isNotBlank(query.getFacCode())) {
+//            queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getFacCode, query.getFacCode());
+//        }
+//
+//        if (query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.NEW.getValue()) == 0) {
+//            queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getCurrentVersion, getMaxVersion());
+//        } else if (query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.DEFINE.getValue() ) == 0){
+//            queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getCurrentVersion, query.getBomVersion());
+//        }
+//
+//        if (StrUtil.isNotBlank(query.getStartDate()) && StrUtil.isNotBlank(query.getEndDate())) {
+//
+//            queryWrapper.lambda().ge(BomNewPbomParentFormalEntity::getCreatedTime, query.getStartDate())
+//                    .le(BomNewPbomParentFormalEntity::getReleaseTime, query.getEndDate());
+//
+//        }
+//        return queryWrapper;
+//    }
 
     List<BomNewPbomParentVO> getParentChildList(List<Long> bomRowId) {
         List<BomNewPbomParentVO> parentChildList = null;
@@ -142,14 +142,14 @@ public class PBomForwardReport  extends BaseForwardReport {
 
 
 
-   List<BomNewPbomParentFormalEntity>  getParent() {
-        QueryWrapper<BomNewPbomParentFormalEntity> queryWrapper = buildQuery();
-        List<BomNewPbomParentFormalEntity> list = SpringUtil.getBean(BomNewPbomParentFormalService.class).list(queryWrapper);
-       //        if (CollectionUtil.isEmpty(list)) {
-       //            throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码为{}的数据信息", query.getMaterialNo()));
-       //        }
-        return list;
-    }
+//   List<BomNewPbomParentFormalEntity>  getParent() {
+//        QueryWrapper<BomNewPbomParentFormalEntity> queryWrapper = buildQuery();
+//        List<BomNewPbomParentFormalEntity> list = SpringUtil.getBean(BomNewPbomParentFormalService.class).list(queryWrapper);
+//       //        if (CollectionUtil.isEmpty(list)) {
+//       //            throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码为{}的数据信息", query.getMaterialNo()));
+//       //        }
+//        return list;
+//    }
 
 
     List<BomNewPbomParentVO> getParentV2() {