From 29d9bcb6fcb904ed65443ed27d2c1b2c1b33ed93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Tue, 28 May 2024 23:22:18 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=BD=ACPBOM=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewEbomParentService.java       | 18 +++++++++---------
 .../service/BomNewPbomParentService.java       |  4 ++--
 2 files changed, 11 insertions(+), 11 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 94e70b0f..5c92ae98 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
@@ -859,15 +859,15 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             }
         });
         //检查该版本是否已转换过该工厂的Pbom
-//        for (BomNewEbomParentEntity parent : parents){
-//            List<BomNewPbomParentEntity> list = pBomParentService.lambdaQuery().eq(BomNewPbomParentEntity::getMaterialNo, parent.getMaterialNo()).eq(BomNewPbomParentEntity::getCurrentVersion, parent.getCurrentVersion())
-//                    .select(BomNewPbomParentEntity::getFacCode).list();
-//            if(CollUtil.isNotEmpty(list)){
-//                Set<String> dbExistsFac = list.stream().map(u -> u.getFacCode()).collect(Collectors.toSet());
-//                Set<String> checkResultFac = Sets.intersection(dbExistsFac, new HashSet<>(paramDto.getFacCodes()));
-//                VUtils.isTure(CollUtil.isNotEmpty(checkResultFac)).throwMessage("物料："+parent.getMaterialNo()+"已经转换过"+ StrUtil.join(",", checkResultFac)+"工厂");
-//            }
-//        }
+        for (BomNewEbomParentEntity parent : parents){
+            List<BomNewPbomParentEntity> list = pBomParentService.lambdaQuery().eq(BomNewPbomParentEntity::getMaterialNo, parent.getMaterialNo()).eq(BomNewPbomParentEntity::getCurrentVersion, parent.getCurrentVersion())
+                    .select(BomNewPbomParentEntity::getFacCode).list();
+            if(CollUtil.isNotEmpty(list)){
+                Set<String> dbExistsFac = list.stream().map(u -> u.getFacCode()).collect(Collectors.toSet());
+                Set<String> checkResultFac = Sets.intersection(dbExistsFac, new HashSet<>(paramDto.getFacCodes()));
+                VUtils.isTure(CollUtil.isNotEmpty(checkResultFac)).throwMessage("物料："+parent.getMaterialNo()+"已经转换过"+ StrUtil.join(",", checkResultFac)+"工厂");
+            }
+        }
 
         for (Long bomRowId : paramDto.getBomRowIds()) {
             BomNewEbomParentVO parent = Convert.convert(BomNewEbomParentVO.class, this.getById(bomRowId));
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 593a33f5..fd431402 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
@@ -289,9 +289,9 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
                         child.setDeviseUserCode(parentEntity.getDeviseUserCode());
 
                         child.setCreatedTime(parentEntity.getCreatedTime());
-                        if (parentEntity.getBomExist() == 1) {
+//                        if (parentEntity.getBomExist() == 1) {
                             child.setBomRowId(parentEntity.getRowId());
-                        }
+//                        }
                         child.setLevelNum(parentEntity.getLevelNum());
                         child.setDeptName(parentEntity.getDeptName());
                         child.setChangeDesc(parentEntity.getChangeDesc());