From 30abb6a9cb4a7a75ae0cde129f405c53f953b389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Tue, 4 Jun 2024 08:17:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(ebom):=20=E7=A7=BB=E9=99=A4=E4=B8=8D?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/nflg/product/bomnew/api/user/EbomApi.java | 5 ++---
 .../nflg/product/bomnew/pojo/vo/BomNewEbomEditDetailVO.java | 6 ------
 .../product/bomnew/service/BomNewEbomParentService.java     | 3 +--
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java
index 97ec92a9..30c3f5de 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java
@@ -297,8 +297,7 @@ public class EbomApi extends BaseApi {
     @ApiOperation("编辑物料列表")
     public ResultVO<BomNewEbomEditDetailVO> editDetail(@RequestParam("rowId") Long rowId, @RequestParam("bomRowId") Long bomRowId
             , @RequestParam("projectType") String projectType
-            , @RequestParam(value = "hideVirtualPackage", defaultValue = "0") Integer hideVirtualPackage
-            , @RequestParam("parentBomRowId") Long parentBomRowId) {
+            , @RequestParam(value = "hideVirtualPackage", defaultValue = "0") Integer hideVirtualPackage) {
         if (Objects.isNull(rowId)) {
             VUtils.isTure(true).throwMessage("rowId 不能为空");
         }
@@ -306,7 +305,7 @@ public class EbomApi extends BaseApi {
             VUtils.isTure(true).throwMessage("bomRowId不能为空");
         }
 
-        return ResultVO.success(bomNewEbomParentService.editDetail(rowId, bomRowId, projectType, hideVirtualPackage, parentBomRowId));
+        return ResultVO.success(bomNewEbomParentService.editDetail(rowId, bomRowId, projectType, hideVirtualPackage));
     }
 
     @PostMapping("updateProjectType")
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomEditDetailVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomEditDetailVO.java
index ea9894dd..03835bd4 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomEditDetailVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomEditDetailVO.java
@@ -25,10 +25,4 @@ public class BomNewEbomEditDetailVO implements Serializable {
      */
     @ApiModelProperty("当前节点的子级")
     private List<BomNewEbomParentVO> datas;
-
-    /*
-     * 当前节点的上级节点
-     */
-    @ApiModelProperty("当前节点的上级节点")
-    private BomNewEbomParentVO parentParent;
 }
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 e8bf765c..29355798 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
@@ -1586,7 +1586,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         return true;
     }
 
-    public BomNewEbomEditDetailVO editDetail(Long rowId, Long bomRowId, String projectType, Integer hideVirtualPackage, Long parentBomRowId) {
+    public BomNewEbomEditDetailVO editDetail(Long rowId, Long bomRowId, String projectType, Integer hideVirtualPackage) {
 
         BomNewEbomEditDetailVO vo = new BomNewEbomEditDetailVO();
         BomNewEbomParentVO parentVO;
@@ -1638,7 +1638,6 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
 
         vo.setParent(parentVO);
-        vo.setParentParent(Convert.convert(BomNewEbomParentVO.class, this.getBaseMapper().selectById(parentBomRowId)));
         return vo;
 
     }