From ff6d7641bd5907e8128280839247ce15398e1e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Mon, 9 Sep 2024 15:52:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=ACpbom-pbom=E4=B8=AD=E6=9C=89=E6=89=8B?=
 =?UTF-8?q?=E5=B7=A5=E6=96=B0=E5=A2=9E=E7=9A=84=E6=97=B6=EF=BC=8C=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/domain/EBom/EBomToPbomBase.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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<String, BomNewEbomParentVO> 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())) {