From 1aa13ece77fc0b87d2df3b0a1d96fa0e87cb96e3 Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Sun, 7 Jan 2024 20:57:40 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/service/BomNewPbomParentService.java   | 1 +
 .../product/bomnew/service/domain/EBom/EBomDetailTask.java     | 3 +++
 2 files changed, 4 insertions(+)

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 ee3254c1..aa6d1b21 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
@@ -543,6 +543,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
             List<BomNewPbomParentVO> allBom = getAllBom(bomRowId, 0);
             List<Long> bomRowIds = allBom.stream().filter(u -> PBomStatusEnum.WAIT_PUBLISH.equalsValue(u.getStatus()) && u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList());
             Integer state= parent.getMaterialNo().startsWith("31")?PBomStatusEnum.WAIT_FACTORY.getValue():PBomStatusEnum.PUBLISH.getValue();
+            bomRowIds.add(bomRowId);
             this.getBaseMapper().bomRelease(state,SessionUtil.getUserName(),bomRowIds);
         }
         catch (Exception ex){
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDetailTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDetailTask.java
index a7bc8a34..3374a09b 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDetailTask.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDetailTask.java
@@ -62,6 +62,9 @@ public class EBomDetailTask extends RecursiveTask<List<BomNewEbomParentVO>> {
                     detailVO.setBomRowId(ebomParentEntity.getRowId());
                     detailVO.setSourceRowId(ebomParentEntity.getSourceRowId());
                     detailVO.setCurrentVersion(ebomParentEntity.getCurrentVersion());
+                    detailVO.setDeviseUserCode(ebomParentEntity.getDeviseUserCode());
+                    detailVO.setDeptName(ebomParentEntity.getDeptName());
+                    detailVO.setDeviseName(ebomParentEntity.getDeviseName());
                 }
             }