bom查询 根节点数量空引起异常
This commit is contained in:
parent
8122ebdd8a
commit
bb6e4daec0
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -50,10 +50,12 @@ public abstract class BaseForwardReport {
|
|||
listMap.forEach((key, value) -> {
|
||||
value.forEach(parent -> {
|
||||
List<ForwardReportVO> 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()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue