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