From 43356a7228e5483b1c92eef4346acff64f203047 Mon Sep 17 00:00:00 2001
From: 10002327 <lhj123456>
Date: Tue, 24 Sep 2024 21:24:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90PBOM=E6=97=B6=EF=BC=8Cbom?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=AD=90=E9=A1=B9=E7=9A=84=E8=AF=9D=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=85=E7=94=9F=E6=88=90EBOM=E6=AD=A3=E5=BC=8F=E8=A1=A83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewEbomParentService.java      | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 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 2ef8c2cc..905b0c8d 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
@@ -1026,13 +1026,13 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                         .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()
-                            .map(m -> {
-                                OperationErrorMsgVO oem = new OperationErrorMsgVO();
-                                oem.setPrimaryKey(m);
-                                oem.msg = String.format("物料%s因下级全部是F项，仅保存EBOM，未生成PBOM数据",m);
-                                return oem;
-                            }).collect(Collectors.toList());
+//                    rList = emptyChildParentList.stream().map(BomNewPbomParentEntity::getMaterialNo).distinct()
+//                            .map(m -> {
+//                                OperationErrorMsgVO oem = new OperationErrorMsgVO();
+//                                oem.setPrimaryKey(m);
+//                                oem.msg = String.format("物料%s因下级全部是F项，仅保存EBOM，未生成PBOM数据",m);
+//                                return oem;
+//                            }).collect(Collectors.toList());
                     eBomToPBom.getPBomParentResult().removeAll(emptyChildParentList);
                 }
             }
@@ -1180,6 +1180,15 @@ 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()
@@ -1188,16 +1197,16 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 eBomToPBom.getPBomChildResult().removeAll(pbomChild);
                 //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()
-                            .map(m -> {
-                                OperationErrorMsgVO oem = new OperationErrorMsgVO();
-                                oem.setPrimaryKey(m);
-                                oem.msg = String.format("物料%s因下级全部是F项，仅保存EBOM，未生成PBOM数据",m);
-                                return oem;
-                            }).collect(Collectors.toList());
+//                    rList = emptyChildParentList.stream().map(BomNewPbomParentEntity::getMaterialNo).distinct()
+//                            .map(m -> {
+//                                OperationErrorMsgVO oem = new OperationErrorMsgVO();
+//                                oem.setPrimaryKey(m);
+//                                oem.msg = String.format("物料%s因下级全部是F项，仅保存EBOM，未生成PBOM数据",m);
+//                                return oem;
+//                            }).collect(Collectors.toList());
                     eBomToPBom.getPBomParentResult().removeAll(emptyChildParentList);
                 }