From bebe0e3fe629e7935a3514c5f151c97c06c5698e Mon Sep 17 00:00:00 2001
From: 10002327 <lhj123456>
Date: Wed, 18 Sep 2024 08:34:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E6=8E=A7=E7=B3=BB=E7=BB=9F=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E5=8C=85=E4=BC=98=E5=8C=969.18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewPbomExportToSAPImpl.java  | 7 +++++--
 .../java/com/nflg/product/bomnew/service/DQBomService.java | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java
index 60d36ece..7171ac35 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java
@@ -141,14 +141,17 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP {
 
     private Long getZFBBomRowId(List<BomNewPbomChildEntity> children) {
         Long ddpRowId = null;
+        //电控系统的无须增加 直发包parent记录 by 10002327 240918
         BomNewPbomChildEntity czfb = children.stream()
-                .filter(c -> Objects.equals(c.getVirtualPartType(), VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue()))
+                .filter(c -> Objects.equals(c.getVirtualPartType(), VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue())
+                && !c.getMaterialDesc().contains("电控系统"))
                 .findFirst()
                 .orElse(null);
         if (Objects.nonNull(czfb)) {
             BomNewPbomParentEntity cpttp = getParent(czfb);
             //            VUtils.isTure(Objects.isNull(cpttp)).throwMessage(StrUtil.format("顶层直发包({})对应的parent丢失", czfb.getMaterialNo()));
-            if (Objects.isNull(cpttp)) {
+
+            if (Objects.isNull(cpttp) ) {
                 //添加直发包的parent
                 cpttp = addZFBParent(czfb);
             }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
index b8c2de7e..b0e06d42 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
@@ -514,8 +514,9 @@ public class DQBomService {
         buildTree(root, parents, children);
         dQBomParentService.updateBatchById(parents);
         dQBomChildService.updateBatchById(children);
-        savePbomParents(parents, root.getMaterialNo().startsWith("31") ? PBomStatusEnum.FACTORY_CONFIRM : PBomStatusEnum.PUBLISH);
-        savePbomChildren(children, parents);
+        //电气BOM发布正式版之后，不再写入导入PBOM中 by 10002327 240914
+        //savePbomParents(parents, root.getMaterialNo().startsWith("31") ? PBomStatusEnum.FACTORY_CONFIRM : PBomStatusEnum.PUBLISH);
+        //savePbomChildren(children, parents);
 
 //        CompletableFuture.runAsync(() -> {
 //            bomNewPbomParentService.getBaseMapper().updatePBomMaterialUse();