From 87ce4de0fb1ed0c89c174ad0afc7b6a3bb4d268a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Sun, 6 Oct 2024 19:48:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(pbom):=20=E4=BF=AE=E5=A4=8D=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E8=8A=82=E7=82=B9=E5=BC=82=E5=B8=B8=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/domain/ReverseReport/EBomQueryService.java    | 8 +++++---
 .../service/domain/ReverseReport/PBomQueryService.java    | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java
index 225fe560..5f7d2007 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java
@@ -164,7 +164,7 @@ public class EBomQueryService {
                         && Objects.equals(v.getNum(), it.getNum())
                         && StrUtil.equals(v.getMaterialUnit(), it.getMaterialUnit())
                         && StrUtil.equals(v.getCreatedBy(), it.getCreatedBy()))) {
-                    vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1)));
+                    vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1), pVO));
                 }
                 bindData(it, level + 1, vos);
             }
@@ -175,15 +175,17 @@ public class EBomQueryService {
         return ebomParentService.getReverseBoms(parentRowId);
     }
 
-    private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO) {
+    private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO, BomNewPbomParentVO pVO) {
         ReverseReportVO vo = Convert.convert(ReverseReportVO.class, parentVO);
         vo.setLevelNum(level);
         if (Objects.isNull(lastVO)) {
             vo.setBomVersion("1");
+            vo.setChildNum(pVO.getNum());
+            vo.setChildMaterialUnit(pVO.getMaterialUnit());
         } else {
             vo.setBomVersion(level >= lastVO.getLevelNum() ? lastVO.getBomVersion() : String.valueOf(Integer.parseInt(lastVO.getBomVersion()) + 1));
             vo.setChildNum(lastVO.getNum());
-            vo.setChildMaterialUnit(lastVO.getChildMaterialUnit());
+            vo.setChildMaterialUnit(lastVO.getMaterialUnit());
         }
         return vo;
     }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/PBomQueryService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/PBomQueryService.java
index f9af58bc..d9f35a97 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/PBomQueryService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/PBomQueryService.java
@@ -158,7 +158,7 @@ public class PBomQueryService {
                         && Objects.equals(v.getNum(), it.getNum())
                         && StrUtil.equals(v.getMaterialUnit(), it.getMaterialUnit())
                         && StrUtil.equals(v.getCreatedBy(), it.getCreatedBy()))) {
-                    vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1)));
+                    vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1), pVO));
                 }
                 bindData(it, level + 1, vos);
             }
@@ -169,15 +169,17 @@ public class PBomQueryService {
         return pbomParentService.getReverseBoms(parentRowId);
     }
 
-    private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO) {
+    private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO, BomNewPbomParentVO pVO) {
         ReverseReportVO vo = Convert.convert(ReverseReportVO.class, parentVO);
         vo.setLevelNum(level);
         if (Objects.isNull(lastVO)) {
             vo.setBomVersion("1");
+            vo.setChildNum(pVO.getNum());
+            vo.setChildMaterialUnit(pVO.getMaterialUnit());
         } else {
             vo.setBomVersion(level >= lastVO.getLevelNum() ? lastVO.getBomVersion() : String.valueOf(Integer.parseInt(lastVO.getBomVersion()) + 1));
             vo.setChildNum(lastVO.getNum());
-            vo.setChildMaterialUnit(lastVO.getChildMaterialUnit());
+            vo.setChildMaterialUnit(lastVO.getMaterialUnit());
         }
         return vo;
     }