From 24c9169033865c02c1a887227874d9eef280a8ce Mon Sep 17 00:00:00 2001 From: jing's Date: Sun, 21 Jul 2024 12:57:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=95=B0=E9=87=8F=E7=A9=BA?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/pojo/vo/ForwardReportVO.java | 7 ++++--- .../product/bomnew/service/domain/BaseForwardReport.java | 6 +++++- 2 files changed, 9 insertions(+), 4 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 5fa73e91..d31c8710 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 @@ -78,10 +78,11 @@ public class ForwardReportVO extends BaseMaterialVO { DecimalFormat df2 = new DecimalFormat("#.####"); return new BigDecimal(df2.format(num)); - }else{ - return new BigDecimal(1); } - // return num; +// else{ +// return new BigDecimal(1); +// } + 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 0b5475bf..7b392c9f 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 @@ -77,7 +77,11 @@ public abstract class BaseForwardReport { if(Objects.nonNull(parent.getNum())) { for (ForwardReportVO data : dataList) { - data.setNum(parent.getNum().multiply(data.getNum())); + if(Objects.nonNull(data.getNum())) { + data.setNum(parent.getNum().multiply(data.getNum())); + } + + } } }