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

Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition

This commit is contained in:
曹鹏飞 2024-06-27 17:42:50 +08:00
parent 963062bee5 c1041084ff
commit c1eb489f7d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,9 @@ public class EBomFormalTreeTask extends RecursiveTask<List<BomNewEbomParentForma
*/ */
public void handlerChildBomVersionDetail() { public void handlerChildBomVersionDetail() {
if(CollUtil.isEmpty(bomDetail)){
return;
}
for (BomNewEbomParentFormalVO vo: for (BomNewEbomParentFormalVO vo:
bomDetail ) { bomDetail ) {
vo.setLevelNum(levelNum); vo.setLevelNum(levelNum);

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

@ -49,6 +49,10 @@ public class PBomFormalTreeTask extends RecursiveTask<List<BomNewPbomParentForma
bomDetail ) { bomDetail ) {
vo.setLevelNum(levelNum); vo.setLevelNum(levelNum);
} }
if(CollUtil.isEmpty(bomDetail)){
return;
}
SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(bomDetail, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(bomDetail, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
List<Long> bomRowIds=bomDetail.stream().filter(u -> u.getBomRowId()>0 ).map(BomNewPbomParentFormalVO::getBomRowId).collect(Collectors.toList()); List<Long> bomRowIds=bomDetail.stream().filter(u -> u.getBomRowId()>0 ).map(BomNewPbomParentFormalVO::getBomRowId).collect(Collectors.toList());