From bb6e4daec09f0556b61b59e7497d0e57adc813a4 Mon Sep 17 00:00:00 2001 From: "BF-202309241046\\Administrator" Date: Mon, 15 Jul 2024 17:09:53 +0800 Subject: [PATCH] =?UTF-8?q?bom=E6=9F=A5=E8=AF=A2=20=E6=A0=B9=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E6=95=B0=E9=87=8F=E7=A9=BA=E5=BC=95=E8=B5=B7=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/pojo/vo/ForwardReportVO.java | 4 +++- .../bomnew/service/domain/BaseForwardReport.java | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ForwardReportVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ForwardReportVO.java index 393fcc65..1a90a9ff 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ForwardReportVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ForwardReportVO.java @@ -62,8 +62,10 @@ public class ForwardReportVO extends BaseMaterialVO { DecimalFormat df2 = new DecimalFormat("#.####"); return new BigDecimal(df2.format(num)); + }else{ + return new BigDecimal(1); } - return num; + // return num; } 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 6b42a59a..c75d4d02 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 @@ -50,10 +50,12 @@ public abstract class BaseForwardReport { listMap.forEach((key, value) -> { value.forEach(parent -> { List dataList = bomParentMap.get(parent.getBomRowId()); - if (CollectionUtil.isNotEmpty(dataList)) { - for (ForwardReportVO data : - dataList) { - data.setNum(parent.getNum().multiply(data.getNum())); + if (CollectionUtil.isNotEmpty(dataList) ) { + if(Objects.nonNull(parent.getNum())) { + for (ForwardReportVO data : + dataList) { + data.setNum(parent.getNum().multiply(data.getNum())); + } } }