From 3f51dd331722e46cdaccbe26d13d170813405999 Mon Sep 17 00:00:00 2001
From: 10002327 <lhj123456>
Date: Tue, 24 Sep 2024 20:55:38 +0800
Subject: [PATCH] =?UTF-8?q?pbom=E6=AD=A3=E5=BC=8F=E8=A1=A8=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E7=94=B5=E6=8E=A7=E7=B3=BB=E7=BB=9F=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewEbomParentService.java  | 9 ++++++++-
 .../product/bomnew/service/domain/EBom/EBomToPBom.java   | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index d1bc3c8d..2ef8c2cc 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -1000,6 +1000,13 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 //1、删掉pbom 父级的数据
                 List<BomNewPbomParentEntity> pbomParent = eBomToPBom.getPBomParentResult().stream().filter(p -> (p.getMaterialDesc().contains("电控系统") && p.getMaterialDesc().contains("直发")) ||
                         (p.getMaterialDesc().contains("电控系统") && p.getMaterialDesc().contains("制作"))).collect(Collectors.toList());
+                if(!pbomParent.isEmpty()){
+                    String m = pbomParent.stream().map(BomNewPbomParentEntity::getMaterialNo).distinct().collect(Collectors.joining(","));
+                    OperationErrorMsgVO oem = new OperationErrorMsgVO();
+                    oem.setPrimaryKey(m);
+                    oem.msg = String.format("物料%s因属于电控系统直发包或制作包，仅保存EBOM，未生成PBOM数据。",m);
+                    rList.add(oem);
+                }
                 eBomToPBom.getPBomParentResult().removeAll(pbomParent);
                 //2、删掉pbom 子级的数据
                 List<BomNewPbomChildEntity> pbomChild = eBomToPBom.getPBomChildResult().stream()
@@ -1016,7 +1023,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 //                }
                 //3、判断parent下是否有子级，如果没有的话，把parent给删除了  物料****因下级全部是F项，仅保存EBOM，未生成PBOM数据
                 List<BomNewPbomParentEntity> emptyChildParentList = eBomToPBom.getPBomParentResult().stream()
-                        .filter(p -> !eBomToPBom.getPBomChildResult().stream().map(BomNewPbomChildEntity::getParentRowId).collect(Collectors.toList()).contains(p.getRowId()) )
+                        .filter(p -> !p.getMaterialDesc().contains("电控系统") && !eBomToPBom.getPBomChildResult().stream().map(BomNewPbomChildEntity::getParentRowId).collect(Collectors.toList()).contains(p.getRowId()) )
                         .collect(Collectors.toList());
                 if(!emptyChildParentList.isEmpty()){
                     rList = emptyChildParentList.stream().map(BomNewPbomParentEntity::getMaterialNo).distinct()
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
index 94161cf1..19654e2f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
@@ -2,6 +2,7 @@ package com.nflg.product.bomnew.service.domain.EBom;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.enums.BooleanEnum;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -97,7 +98,7 @@ public class EBomToPBom extends EBomToPbomBase {
                 continue;
             }
             List<BomNewEbomParentVO> parentList = ListCommonUtil.toDistinct(result.stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList()), BomNewEbomParentVO::getBomRowId);
-            if(EBomConstant.MAIN_FACTORY_CODE_1010.equals(facCode)){
+            if(EBomConstant.MAIN_FACTORY_CODE_1010.equals(facCode) && CollectionUtil.isNotEmpty(facBomDataMp.get(facCode)) ){
                 parentList = ListCommonUtil.toDistinct(facBomDataMp.get(facCode).stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList()), BomNewEbomParentVO::getBomRowId);
             }
             for (BomNewEbomParentVO vo : parentList) {