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

单层bomversion

This commit is contained in:
jing's 2024-07-23 09:49:05 +08:00
parent bbc58e4aa6
commit 4f02752c5b
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
View File

@ -298,12 +298,13 @@ public class EBomForwardReport extends BaseForwardReport {
AtomicInteger orderNum = new AtomicInteger(1);
parentFormal.setLevelNum(1);
parentFormal.setOrderNumber(orderNum.getAndIncrement() + "");
nodesList.add(Convert.convert(ForwardReportVO.class, parentFormal));
List<ForwardReportVO> nodeList=new ArrayList<>();
nodeList.add(Convert.convert(ForwardReportVO.class, parentFormal));
bomUpAndLowLevel(ImmutableList.of(parentFormal), parentChildList, null, 2, orderNum);
List<ForwardReportVO> nodeList = Convert.convert(new TypeReference<List<ForwardReportVO>>() {
}, parentChildList);
nodeList.addAll( Convert.convert(new TypeReference<List<ForwardReportVO>>() {
}, parentChildList));
nodeList.forEach(item->{
item.setBomVersion(parentFormal.getCurrentVersion());
});

8
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java
View File

@ -309,10 +309,12 @@ public class PBomForwardReport extends BaseForwardReport {
AtomicInteger orderNum = new AtomicInteger(1);
parentFormal.setLevelNum(1);
parentFormal.setOrderNumber(orderNum.getAndIncrement() + "");
nodesList.add(Convert.convert(ForwardReportVO.class, parentFormal));
List<ForwardReportVO> nodeList=new ArrayList<>();
nodeList.add(Convert.convert(ForwardReportVO.class, parentFormal));
bomUpAndLowLevel(ImmutableList.of(parentFormal), parentChildList, null, 2, orderNum);
List<ForwardReportVO> nodeList = Convert.convert(new TypeReference<List<ForwardReportVO>>() {
}, parentChildList);
nodeList.addAll( Convert.convert(new TypeReference<List<ForwardReportVO>>() {
}, parentChildList));
nodeList.forEach(item->{
item.setBomVersion(parentFormal.getCurrentVersion());