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

Merge remote-tracking branch 'origin/master-checkVirtualPackage-lhj0920' into test

This commit is contained in:
10001392 2024-09-24 21:08:27 +08:00
parent dd79b21e34 935f4f596e
commit 142201fa5e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/EBomToPBomForFormalNew.java
View File

@ -97,7 +97,7 @@ public class EBomToPBomForFormalNew extends FormalEBomToPbomBase {
continue;
}
List<BomNewEbomParentVO> parentList = ListCommonUtil.toDistinct(result.stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList()), BomNewEbomParentVO::getBomRowId);
if(EBomConstant.MAIN_FACTORY_CODE_1010.equals(facCode)){
if(EBomConstant.MAIN_FACTORY_CODE_1010.equals(facCode) && CollUtil.isNotEmpty(facBomDataMp.get(facCode))){
parentList = ListCommonUtil.toDistinct(facBomDataMp.get(facCode).stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList()), BomNewEbomParentVO::getBomRowId);
}