From ca7bbdc3532c7445124040de2b08a55c9bae0ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Wed, 28 Aug 2024 14:23:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=ACEBOM=E6=97=B6-=20PBOM=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewPbomParentService.java      | 33 +++++++++----------
 .../topbomnew/EBomToPBomForFormalNew.java     |  9 +++--
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index 05e5b660..8abdf474 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -1151,24 +1151,23 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
             else {
                 bomRowIds.add(bomRowId);
             }
-            this.getBaseMapper().bomRelease(state, SessionUtil.getUserName(), bomRowIds);
-            //同步sap
-            // saySyncDEMO();
-//            importSap(parent,allBom);
-            //记录-BOM版本RowId
-            List<BomNewPbomChildEntity> pBomChildren = new ArrayList<>();
-            allBom.forEach(k -> {
-                BomNewPbomChildEntity entChild = new BomNewPbomChildEntity();
-                entChild.setRowId(k.getRowId());
-                entChild.setBomVersionRowId(k.getBomRowId());
-                pBomChildren.add(entChild);
-            });
-            if (CollUtil.isNotEmpty(pBomChildren)) {
-                pbomChildService.updateBatchById(pBomChildren);
-            }
+            if(CollUtil.isNotEmpty(bomRowIds)) {
+                this.getBaseMapper().bomRelease(state, SessionUtil.getUserName(), bomRowIds);
+                //记录-BOM版本RowId
+                List<BomNewPbomChildEntity> pBomChildren = new ArrayList<>();
+                allBom.forEach(k -> {
+                    BomNewPbomChildEntity entChild = new BomNewPbomChildEntity();
+                    entChild.setRowId(k.getRowId());
+                    entChild.setBomVersionRowId(k.getBomRowId());
+                    pBomChildren.add(entChild);
+                });
+                if (CollUtil.isNotEmpty(pBomChildren)) {
+                    pbomChildService.updateBatchById(pBomChildren);
+                }
 
-            //历史版本转移到formal正式工作表
-            pBomToFormal(bomRowIds, parentMaterialNos,parent.getFacCode());
+                //历史版本转移到formal正式工作表
+                pBomToFormal(bomRowIds, parentMaterialNos, parent.getFacCode());
+            }
 
 //            SpringUtil.getBean(BomNewPbomParentFormalService.class).copyPbomFormal(bomRowId);
         } catch (Exception ex) {
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/EBomToPBomForFormalNew.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/EBomToPBomForFormalNew.java
index 159f78f7..8aa414d8 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/EBomToPBomForFormalNew.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/EBomToPBomForFormalNew.java
@@ -89,10 +89,13 @@ public class EBomToPBomForFormalNew extends FormalEBomToPbomBase {
                     continue;
                 }
                 //检查是否用户跟用户节点（）
-                List<String> childMaterialNos = SpringUtil.getBean(BomNewPbomParentMapper.class).getPBomExistMaterialInChildForWorkList(parentEnt.getMaterialNo());
-                if(CollUtil.isEmpty(childMaterialNos)){
-                    parentEnt.setUserRootIs(1);
+                if(parentEnt.getMaterialNo().equals(parent.getMaterialNo())) {
+                    List<String> childMaterialNos = SpringUtil.getBean(BomNewPbomParentMapper.class).getPBomExistMaterialInChildForWorkList(parent.getMaterialNo());
+                    if (CollUtil.isEmpty(childMaterialNos)) {
+                        parentEnt.setUserRootIs(1);
+                    }
                 }
+
                 //子级
                 if (CollUtil.isNotEmpty(child)) {
                     //合并子级