From 4f02752c5b7324efebb5eb040867dd97425501bb Mon Sep 17 00:00:00 2001 From: jing's Date: Tue, 23 Jul 2024 09:49:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=B1=82bomversion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/domain/EBom/EBomForwardReport.java | 9 +++++---- .../bomnew/service/domain/PBom/PBomForwardReport.java | 8 +++++--- 2 files changed, 10 insertions(+), 7 deletions(-) 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 fe7d3750..210ea85c 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 @@ -298,12 +298,13 @@ public class EBomForwardReport extends BaseForwardReport { AtomicInteger orderNum = new AtomicInteger(1); parentFormal.setLevelNum(1); parentFormal.setOrderNumber(orderNum.getAndIncrement() + ""); - nodesList.add(Convert.convert(ForwardReportVO.class, parentFormal)); - + List nodeList=new ArrayList<>(); + nodeList.add(Convert.convert(ForwardReportVO.class, parentFormal)); bomUpAndLowLevel(ImmutableList.of(parentFormal), parentChildList, null, 2, orderNum); - List nodeList = Convert.convert(new TypeReference>() { - }, parentChildList); + nodeList.addAll( Convert.convert(new TypeReference>() { + }, parentChildList)); + nodeList.forEach(item->{ item.setBomVersion(parentFormal.getCurrentVersion()); }); 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 ec58cf5b..86e1d4aa 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 @@ -309,10 +309,12 @@ public class PBomForwardReport extends BaseForwardReport { AtomicInteger orderNum = new AtomicInteger(1); parentFormal.setLevelNum(1); parentFormal.setOrderNumber(orderNum.getAndIncrement() + ""); - nodesList.add(Convert.convert(ForwardReportVO.class, parentFormal)); + + List nodeList=new ArrayList<>(); + nodeList.add(Convert.convert(ForwardReportVO.class, parentFormal)); bomUpAndLowLevel(ImmutableList.of(parentFormal), parentChildList, null, 2, orderNum); - List nodeList = Convert.convert(new TypeReference>() { - }, parentChildList); + nodeList.addAll( Convert.convert(new TypeReference>() { + }, parentChildList)); nodeList.forEach(item->{ item.setBomVersion(parentFormal.getCurrentVersion());