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())); + } } }