From 51ef33cde6ffcc6cebf78533ab6292ae8431276e Mon Sep 17 00:00:00 2001 From: "BF-202309241046\\Administrator" Date: Thu, 4 Jul 2024 22:45:53 +0800 Subject: [PATCH] =?UTF-8?q?ebom=E6=B1=87=E6=80=BB=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E5=8F=B6=E5=AD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/domain/BaseForwardReport.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/BaseForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/BaseForwardReport.java index 8d0b2011..21558205 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/BaseForwardReport.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/BaseForwardReport.java @@ -1,8 +1,11 @@ package com.nflg.product.bomnew.service.domain; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import com.nflg.product.bomnew.constant.ReportConstant; import com.nflg.product.bomnew.pojo.query.ReverseReportQuery; +import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; import com.nflg.product.bomnew.pojo.vo.ForwardReportVO; import com.nflg.product.bomnew.pojo.vo.ReportBomVO; @@ -54,7 +57,18 @@ public abstract class BaseForwardReport { //无子级的数据 List leafList = convertBomList.stream().filter(item -> (item.getBomRowId() == null || item.getBomRowId().longValue() == 0)).collect(Collectors.toList()); + List bomList = convertBomList.stream().filter(u -> ObjectUtil.isNotNull(u.getBomRowId()) && u.getBomRowId() > 0) + .collect(Collectors.toList()); + bomList.forEach(item->{ + + List tmpList= convertBomList.stream().filter(u -> Objects.equals(u.getParentRowId(),item.getBomRowId()) ) + .collect(Collectors.toList()); + if(CollUtil.isEmpty(tmpList)){ + leafList.add(item); + } + + }); //相同物料合并统计 Map> materialNoListMap = leafList.stream().collect(Collectors.groupingBy(ForwardReportVO::getMaterialNo));