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

Merge remote-tracking branch 'origin/master-virtualPackageOrderNumber-lhj0925' into test

This commit is contained in:
10001392 2024-09-26 11:32:38 +08:00
parent eecc877620 8d31889ccf
commit 483c8bbfe6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
View File

@ -1028,7 +1028,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
&& !eBomToPBom.getPBomChildResult().stream().map(BomNewPbomChildEntity::getParentRowId).collect(Collectors.toList()).contains(p.getRowId()) )
.collect(Collectors.toList());
if(!emptyChildParentList.isEmpty()){
List<BomNewPbomParentEntity> fList = emptyChildParentList.stream().filter(p -> {
//仅选择的第一层需要提示
List<BomNewPbomParentEntity> fList = emptyChildParentList.stream().filter(p -> p.getSourceRowId().equals(bomRowId)).filter(p -> {
Optional<BomNewEbomParentVO> opt = bomTree.stream().filter(t -> p.getMaterialNo().equals(t.getMaterialNo())).findFirst();
if(opt.isPresent()){
List<BomNewEbomParentVO> cList = bomTree.stream().filter(t -> t.getParentRowId().equals(opt.get().getRowId())).collect(Collectors.toList());
@ -1221,7 +1222,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
&& !eBomToPBom.getPBomChildResult().stream().map(BomNewPbomChildEntity::getParentRowId).collect(Collectors.toList()).contains(p.getRowId()) )
.collect(Collectors.toList());
if(!emptyChildParentList.isEmpty()){
List<BomNewPbomParentEntity> fList = emptyChildParentList.stream().filter(p -> {
//仅选择的第一层需要提示
List<BomNewPbomParentEntity> fList = emptyChildParentList.stream().filter(p -> p.getSourceRowId().equals(bomRowId)).filter(p -> {
Optional<BomNewEbomParentVO> opt = bomTree.stream().filter(t -> p.getMaterialNo().equals(t.getMaterialNo())).findFirst();
if(opt.isPresent()){
List<BomNewEbomParentVO> cList = bomTree.stream().filter(t -> t.getParentRowId().equals(opt.get().getRowId())).collect(Collectors.toList());