From 5b3509dccd611111a5cd47a1e5b9c3ef4f427843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Sun, 16 Jun 2024 12:46:32 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81ebom=20=E8=BD=AC=20pbom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/config/MasterDataSourceConfig.java |  3 ++-
 .../service/domain/EBom/EBomToPbomBase.java   | 21 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/config/MasterDataSourceConfig.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/config/MasterDataSourceConfig.java
index fe7b79d7..36120549 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/config/MasterDataSourceConfig.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/config/MasterDataSourceConfig.java
@@ -137,7 +137,8 @@ public class MasterDataSourceConfig {
 
     @Bean("getBomDetailPool")
     public ForkJoinPool getBomNewDetailPool() {
-        return new ForkJoinPool();
+
+        return new ForkJoinPool(4, ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, false);
 
     }
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
index 279ad951..488667f4 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
@@ -153,10 +153,11 @@ public abstract class EBomToPbomBase {
 
 
         if(Objects.isNull(oldParent)){
-            buildParentEntity(parentVo,facCode,oldParent,parentVo.getCurrentVersion());
+          return   buildParentEntity(parentVo,facCode,oldParent,parentVo.getCurrentVersion());
+
         }
         //pbom 处于工作表
-        if (Objects.nonNull(oldParent) && oldParent.getStatus() < EBomStatusEnum.PUBLISHED.getValue()) {
+       else if (Objects.nonNull(oldParent) && oldParent.getStatus() < EBomStatusEnum.PUBLISHED.getValue()) {
             if (oldParent.getCreatedBy() == parentVo.getCreatedBy()) {
                 if (ConvertToPBomModelEnum.OVERRIDE.equals(convertMode.getValue())) {
                     SpringUtil.getBean(BomNewPbomChildService.class).getBaseMapper().deleteByMap(ImmutableMap.of("parent_row_id", oldParent.getRowId()));
@@ -190,6 +191,7 @@ public abstract class EBomToPbomBase {
         pBomParent.setFacCode(facCode);
         pBomParent.setTechnologyUserCode(SessionUtil.getUserCode());
         pBomParent.setTechnologyUserName(SessionUtil.getRealName());
+        pBomParent.setDeptRowId(SessionUtil.getDepartRowId());
         //版本=EBom版本
         pBomParent.setCurrentVersion(bomVersion);
         pBomParent.setEditStatus(PBomEditStatusEnum.HANDLER_CREATED.getValue());
@@ -415,13 +417,14 @@ public abstract class EBomToPbomBase {
             if (VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getVirtualPartType().equals(firstLevelBom.getVirtualPartType()) || VirtualPackageTypeEnum.PRE_ASSEMBLY_PACKAGE.getVirtualPartType().equals(firstLevelBom.getVirtualPartType())) {
                 firstLevelBom.setLevelNumber(levelToNum(preAssemblyPackageLevelNo));
                 firstLevelBom.setLevelNo(preAssemblyPackageLevelNo);
-                continue;
-            }
 
-            String levelKey = StrUtil.isNotBlank(parentDrawingNoRe) ? StrUtil.join("-", parentDrawingNoRe, gNo.toString()) : gNo.toString();
-            firstLevelBom.setLevelNumber(levelToNum(levelKey));
-            firstLevelBom.setLevelNo(levelKey);
-            gNo++;
+            }else {
+
+                String levelKey = StrUtil.isNotBlank(parentDrawingNoRe) ? StrUtil.join("-", parentDrawingNoRe, gNo.toString()) : gNo.toString();
+                firstLevelBom.setLevelNumber(levelToNum(levelKey));
+                firstLevelBom.setLevelNo(levelKey);
+                gNo++;
+            }
             generateDrawingNo(saveBomDetailParamDTO, firstLevelBom.getChildBomRowId(), firstLevelBom.getLevelNo());
 
 
@@ -501,7 +504,7 @@ public abstract class EBomToPbomBase {
      * 转换前生产EBom 版本号
      */
     public void initEBomVersion() {
-        List<BomNewEbomParentVO> parentBoms = allBomDetail.stream().filter(u -> u.getChildBomRowId() > 0).collect(Collectors.toList());
+        List<BomNewEbomParentVO> parentBoms = allBomDetail.stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList());
         for (BomNewEbomParentVO parentBom : parentBoms) {
             if (!EBomStatusEnum.PUBLISHED.equalsValue(parentBom.getStatus())) {
                 //获取正式版