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 7c779a9e..5adee1d8 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 @@ -258,11 +258,13 @@ public abstract class EBomToPbomBase { List oldArtChildren = SpringUtil.getBean(BomNewPbomParentService.class).getChild(oldPBomAddItem.getBomRowId(), 1); for (BomNewPbomParentVO oldArtChild : oldArtChildren) { //工艺包新增 - if (StrUtil.isBlank(oldArtChild.getOriginalMaterialNo()) || newBomChildren.contains(oldArtChild.getOriginalMaterialNo())) { + if (StrUtil.isBlank(oldArtChild.getOriginalMaterialNo())) { buildPBomAddChild(artParent, facCode, oldArtChild); - if(StrUtil.isNotBlank(oldArtChild.getOriginalMaterialNo())) { - delResult.add(oldArtChild.getOriginalMaterialNo()); - } + } + if(StrUtil.isNotBlank(oldArtChild.getOriginalMaterialNo()) && newBomChildrenMap.containsKey(oldArtChild.getOriginalMaterialNo())){ + // newBomChildrenMap.get(oldArtChild.getOriginalMaterialNo()).setParentRowId(artParent.getRowId()); + buildPBomAddChild(artParent, facCode, Convert.convert(BomNewPbomParentVO.class,newBomChildrenMap.get(oldArtChild.getOriginalMaterialNo()) )); + delResult.add(oldArtChild.getOriginalMaterialNo()); } } }