From 0b8748bd1f2480ed5a71074a5908f85c7bf719dc Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Wed, 20 Dec 2023 16:49:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/api/user/EbomApi.java | 13 ++++++++++
 .../pojo/vo/BomNewEbomEditDetailVO.java       | 24 +++++++++++++++++++
 .../service/BomNewEbomParentService.java      | 18 ++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomEditDetailVO.java

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 4cf535da..c9a90cb5 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
@@ -12,6 +12,7 @@ import com.nflg.product.bomnew.pojo.dto.*;
 import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
 import com.nflg.product.bomnew.pojo.query.BomNewEbomParentQuery;
 import com.nflg.product.bomnew.pojo.query.OriginalBomQuery;
+import com.nflg.product.bomnew.pojo.vo.BomNewEbomEditDetailVO;
 import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
 import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO;
 import com.nflg.product.bomnew.service.BomNewEbomParentService;
@@ -194,4 +195,16 @@ public class EbomApi extends BaseApi {
 
 
 
+    @GetMapping("editDetail")
+    @ApiOperation("编辑物料列表")
+    public ResultVO<BomNewEbomEditDetailVO> editDetail(@RequestParam("bomRowId") Long bomRowId) {
+
+        ResultVO resultVO=new ResultVO();
+        resultVO.setData(bomNewEbomParentService.editDetail(bomRowId));
+        return  resultVO;
+    }
+
+
+
+
 }
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
new file mode 100644
index 00000000..d026b820
--- /dev/null
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomEditDetailVO.java
@@ -0,0 +1,24 @@
+package com.nflg.product.bomnew.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.List;
+
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "com-nflg-product-bomnew-pojo-new-vo-BomNewEbomEditDetailVO")
+public class BomNewEbomEditDetailVO implements      Serializable {
+
+    private  BomNewEbomParentVO parent;
+
+    private List<BomNewEbomParentVO> list;
+
+}
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 29abe6e6..1f4e3eea 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
@@ -28,6 +28,7 @@ import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
 import com.nflg.product.bomnew.pojo.entity.MaterialMainEntity;
 import com.nflg.product.bomnew.pojo.query.BomNewEbomParentQuery;
 import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO;
+import com.nflg.product.bomnew.pojo.vo.BomNewEbomEditDetailVO;
 import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
 import com.nflg.product.bomnew.pojo.vo.EbomExcelVO;
 import com.nflg.product.bomnew.service.domain.EBom.*;
@@ -684,4 +685,21 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
     }
 
 
+    public BomNewEbomEditDetailVO editDetail(Long bomRowId){
+
+        BomNewEbomEditDetailVO vo=new BomNewEbomEditDetailVO();
+        BomNewEbomParentEntity parent = this.getBaseMapper().selectById(bomRowId);
+        BomNewEbomParentVO parentVO=  Convert.convert(BomNewEbomParentVO.class,parent);
+        List<BomNewEbomParentVO> parentList=new ArrayList<>();
+        parentList.add(parentVO);
+        materialMainService.intiMaterialInfo(parentList );
+        vo.setList(getChild(bomRowId));
+        vo.setParent(parentList.get(0));
+    return  vo;
+
+    }
+
+
+
+
 }