diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java index 653101c2..7c779a9e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java @@ -245,8 +245,10 @@ public abstract class EBomToPbomBase { Map newBomChildrenMap = newBomChildren.stream().collect(Collectors.toMap(BomNewEbomParentVO::getMaterialNo, u -> u)); for (BomNewPbomParentVO oldPBomAddItem : oldPBomAddChildren) { - //加入当前BOM明细中 - buildPBomAddChild(parent, facCode, oldPBomAddItem); + //加入当前BOM明细中(新增的且新的子级中不包含该物料编码--主要考虑兼容历史数据) + if(!newBomChildrenMap.containsKey(oldPBomAddItem.getMaterialNo())) { + buildPBomAddChild(parent, facCode, oldPBomAddItem); + } //如为工艺包,且在当前BOM中不存在 if (BomConstant.ART_PACKAGE_MATERIAL_CATEGORY_CODE.equals(oldPBomAddItem.getMaterialCategoryCode()) && !newBomChildrenMap.containsKey(oldPBomAddItem.getMaterialNo())) {