From adeb6bccff7acb44fff1ee5dcf2e46397f9996af Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Mon, 18 Mar 2024 23:10:20 +0800
Subject: [PATCH] =?UTF-8?q?mbom=E7=89=88=E6=9C=AC=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/domain/MBom/MBomForwardReport.java     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/MBom/MBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/MBom/MBomForwardReport.java
index c804319b..829b815d 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/MBom/MBomForwardReport.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/MBom/MBomForwardReport.java
@@ -172,6 +172,7 @@ public class MBomForwardReport extends BaseForwardReport {
         List<Long> rowIdList = new ArrayList<>( Arrays.asList(rowId) );
         List<ForwardReportVO> reportVOList = new ArrayList<>();
         orderNum.set(0);
+
         while (!rowIdList.isEmpty()) {
             List<BomNewMbomMiddleVO> childList = SpringUtil.getBean(BomNewMbomParentService.class).getBaseMapper().getParentChild(rowIdList, bomRowId);
             rowIdList.clear();
@@ -206,8 +207,17 @@ public class MBomForwardReport extends BaseForwardReport {
                 if(ObjectUtil.equal(item.getRowId(),item.getBomRowId())){
                     rowId = 0l;
                 }
-                listMap.put(item.getRowId(), queryDetail(isMore, rowId, item.getBomRowId()));
-            }
+              List<ForwardReportVO> list= queryDetail(isMore, rowId, item.getBomRowId());
+
+                BomNewMbomParentEntity parentEntity= SpringUtil.getBean(BomNewMbomParentService.class).getById(item.getBomRowId());
+                list.forEach(u->{
+                    u.setCurrentVersion(parentEntity.getCurrentVersion());
+                });
+
+                listMap.put(item.getRowId(), list );
+
+
+          }
         }
         return listMap;