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

转EBOM时- PBOM发布报错修复2

This commit is contained in:
大米 2024-08-28 11:17:01 +08:00
parent 2a0d37c116
commit f983cf3bcb
2 changed files with 2 additions and 2 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/EBomToPBom.java
View File

@ -77,7 +77,7 @@ public class EBomToPBom extends EBomToPbomBase {
List<BomNewEbomParentVO> child = result.stream().filter(u -> u.getParentRowId().equals(vo.getBomRowId()) && !childDelMaterialNos.contains(u.getMaterialNo())).distinct().collect(Collectors.toList()); List<BomNewEbomParentVO> child = result.stream().filter(u -> u.getParentRowId().equals(vo.getBomRowId()) && !childDelMaterialNos.contains(u.getMaterialNo())).distinct().collect(Collectors.toList());
List<BomNewEbomParentVO> mergeChild = mergeChild(child); List<BomNewEbomParentVO> mergeChild = mergeChild(child);
//判断pbom 是否一致 //判断pbom 是否一致
if( compareContentIsSame(vo, mergeChild, facCode)){ if( compareContentIsSame(vo, mergeChild, facCode) && !vo.getMaterialNo().equals(parent.getMaterialNo())){
continue; continue;
} }
BomNewPbomParentEntity parentEnt = buildPBomParent(vo, facCode,parentList); BomNewPbomParentEntity parentEnt = buildPBomParent(vo, facCode,parentList);

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

@ -117,7 +117,7 @@ public class EBomToPBomFor31 extends EBomToPbomBase {
//子级 //子级
List<BomNewEbomParentVO> child = facBomDataMp.get(facCode).stream().filter(u -> u.getParentRowId().equals(vo.getBomRowId()) && !childDelMaterialNos.contains(u.getMaterialNo())).distinct().collect(Collectors.toList()); List<BomNewEbomParentVO> child = facBomDataMp.get(facCode).stream().filter(u -> u.getParentRowId().equals(vo.getBomRowId()) && !childDelMaterialNos.contains(u.getMaterialNo())).distinct().collect(Collectors.toList());
List<BomNewEbomParentVO> mergeChild = mergeChild(child); List<BomNewEbomParentVO> mergeChild = mergeChild(child);
if(compareContentIsSame(vo, mergeChild, facCode)){ if(compareContentIsSame(vo, mergeChild, facCode) && !vo.getMaterialNo().equals(parent.getMaterialNo())){
continue; continue;
} }
BomNewPbomParentEntity parentEnt = buildPBomParent(vo, facCode, parentList); BomNewPbomParentEntity parentEnt = buildPBomParent(vo, facCode, parentList);