From d10e0700384e465c224c5a48f4f7c194f51c5a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Fri, 31 May 2024 16:13:03 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=85=88=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewEbomParentService.java      | 59 ++++++++++---------
 1 file changed, 30 insertions(+), 29 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 cc5c6768..18aee016 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
@@ -897,35 +897,36 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             }
             //标记跟节点
             upRootMark(parent);
-            if (CollUtil.isNotEmpty(eBomToPBom.getVirtualPackageCompositionResult())) {
-                //先删除
-                Set<String> delSet = eBomToPBom.getVirtualPackageCompositionResult().stream().map(u -> StrUtil.join("-", u.getVirtualPackageMaterialNo(), u.getParentMaterialNo())).collect(Collectors.toSet());
-                for (String s : delSet) {
-                    String[] split = StrUtil.split(s, "-");
-                    virtualPackageCompositionService.getBaseMapper().delByVnoAndParentNo(split[0], split[1]);
-                }
-                virtualPackageCompositionService.saveOrUpdateBatch(eBomToPBom.getVirtualPackageCompositionResult());
-            } else {
-                //记录变更影响
-                if (CollUtil.isNotEmpty(eBomToPBom.getUpgradeChangeResult())) {
-
-                    List<String> vNos = eBomToPBom.getUpgradeChangeResult().stream().map(u -> StrUtil.join(u.getMaterialNo(), u.getRelMaterialNo())).collect(Collectors.toList());
-                    if (CollUtil.isNotEmpty(vNos)) {
-                        upgradeChangeService.getBaseMapper().delByVNo(vNos);
-                    }
-                    upgradeChangeService.saveOrUpdateBatch(eBomToPBom.getUpgradeChangeResult());
-                }
-                if (CollUtil.isNotEmpty(eBomToPBom.getUpgradeChangeDetailResult())) {
-
-                    //先删除
-                    Set<String> delSet = eBomToPBom.getUpgradeChangeDetailResult().stream().map(u -> StrUtil.join("-", u.getVirtualPackageMaterialNo(), u.getParentMaterialNo())).collect(Collectors.toSet());
-                    for (String s : delSet) {
-                        String[] split = StrUtil.split(s, "-");
-                        updateDetailService.getBaseMapper().delByVnoAndParentNo(split[0], split[1]);
-                    }
-                    updateDetailService.saveOrUpdateBatch(eBomToPBom.getUpgradeChangeDetailResult());
-                }
-            }
+//            if (CollUtil.isNotEmpty(eBomToPBom.getVirtualPackageCompositionResult())) {
+//                //先删除
+//                Set<String> delSet = eBomToPBom.getVirtualPackageCompositionResult().stream().map(u -> StrUtil.join("-", u.getVirtualPackageMaterialNo(), u.getParentMaterialNo())).collect(Collectors.toSet());
+//                for (String s : delSet) {
+//                    String[] split = StrUtil.split(s, "-");
+//                    virtualPackageCompositionService.getBaseMapper().delByVnoAndParentNo(split[0], split[1]);
+//                }
+//                virtualPackageCompositionService.saveOrUpdateBatch(eBomToPBom.getVirtualPackageCompositionResult());
+//            }
+//            else {
+//                //记录变更影响
+//                if (CollUtil.isNotEmpty(eBomToPBom.getUpgradeChangeResult())) {
+//
+//                    List<String> vNos = eBomToPBom.getUpgradeChangeResult().stream().map(u -> StrUtil.join(u.getMaterialNo(), u.getRelMaterialNo())).collect(Collectors.toList());
+//                    if (CollUtil.isNotEmpty(vNos)) {
+//                        upgradeChangeService.getBaseMapper().delByVNo(vNos);
+//                    }
+//                    upgradeChangeService.saveOrUpdateBatch(eBomToPBom.getUpgradeChangeResult());
+//                }
+//                if (CollUtil.isNotEmpty(eBomToPBom.getUpgradeChangeDetailResult())) {
+//
+//                    //先删除
+//                    Set<String> delSet = eBomToPBom.getUpgradeChangeDetailResult().stream().map(u -> StrUtil.join("-", u.getVirtualPackageMaterialNo(), u.getParentMaterialNo())).collect(Collectors.toSet());
+//                    for (String s : delSet) {
+//                        String[] split = StrUtil.split(s, "-");
+//                        updateDetailService.getBaseMapper().delByVnoAndParentNo(split[0], split[1]);
+//                    }
+//                    updateDetailService.saveOrUpdateBatch(eBomToPBom.getUpgradeChangeDetailResult());
+//                }
+//            }
             List<Long> bomRowIds = bomTree.stream().filter(u -> u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList());
             if (CollUtil.isNotEmpty(bomRowIds)) {
                 this.getBaseMapper().updateStateBatchByRowIds(EBomStatusEnum.PUBLISHED.getValue(), bomRowIds);