From 8b1974235ea8719017890e067e1af4fe6a0d3395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Tue, 10 Sep 2024 10:16:41 +0800 Subject: [PATCH] =?UTF-8?q?EBOM=E8=BD=ACPBOM-=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/EBom/topbomnew/FormalEBomToPbomBase.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java index e9289431..4a9dd61a 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java @@ -259,11 +259,11 @@ public abstract class FormalEBomToPbomBase { 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()); } } }