rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/DM/nflg-bom-transition' of http://192.168.0.40:3000/root/nflg_project into feature/DM/nflg-bom-transition

This commit is contained in:
曹鹏飞 2024-07-22 10:30:49 +08:00
parent e54dde9610 24c9169033
commit 32e9356862
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ForwardReportVO.java
View File

@ -78,10 +78,11 @@ public class ForwardReportVO extends BaseMaterialVO {
DecimalFormat df2 = new DecimalFormat("#.####"); DecimalFormat df2 = new DecimalFormat("#.####");
return new BigDecimal(df2.format(num)); return new BigDecimal(df2.format(num));
}else{
return new BigDecimal(1);
} }
// return num; // else{
// return new BigDecimal(1);
// }
return num;
} }

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/BaseForwardReport.java
View File

@ -77,8 +77,12 @@ public abstract class BaseForwardReport {
if(Objects.nonNull(parent.getNum())) { if(Objects.nonNull(parent.getNum())) {
for (ForwardReportVO data : for (ForwardReportVO data :
dataList) { dataList) {
if(Objects.nonNull(data.getNum())) {
data.setNum(parent.getNum().multiply(data.getNum())); data.setNum(parent.getNum().multiply(data.getNum()));
} }
}
} }
} }