From 8dc7503f39965b5628e0a57072650e47b8955757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Fri, 10 May 2024 16:29:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(ebom):=20=E7=BC=96=E8=BE=91=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=9A=90=E8=97=8F=E8=99=9A=E6=8B=9F=E5=8C=85?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/api/user/EbomApi.java |  6 +++---
 .../service/BomNewEbomParentService.java      | 19 ++++++++++++++-----
 2 files changed, 17 insertions(+), 8 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 00b5f29e..323a7164 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
@@ -289,10 +289,10 @@ public class EbomApi extends BaseApi {
         return ResultVO.success(true);
     }
 
-
     @GetMapping("editDetail")
     @ApiOperation("编辑物料列表")
-    public ResultVO<BomNewEbomEditDetailVO> editDetail(@RequestParam("rowId") Long rowId, @RequestParam("bomRowId") Long bomRowId, @RequestParam("projectType") String projectType) {
+    public ResultVO<BomNewEbomEditDetailVO> editDetail(@RequestParam("rowId") Long rowId, @RequestParam("bomRowId") Long bomRowId
+            , @RequestParam("projectType") String projectType, @RequestParam(value = "hideVirtualPackage", defaultValue = "0") Integer hideVirtualPackage) {
         if (Objects.isNull(rowId)) {
             VUtils.isTure(true).throwMessage("rowId 不能为空");
         }
@@ -300,7 +300,7 @@ public class EbomApi extends BaseApi {
             VUtils.isTure(true).throwMessage("bomRowId不能为空");
         }
 
-        return ResultVO.success(bomNewEbomParentService.editDetail(rowId, bomRowId, projectType));
+        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/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index 47ce7262..61332f08 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
@@ -1543,11 +1543,11 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         return true;
     }
 
-    public BomNewEbomEditDetailVO editDetail(Long rowId, Long bomRowId, String projectType) {
+    public BomNewEbomEditDetailVO editDetail(Long rowId, Long bomRowId, String projectType, Integer hideVirtualPackage) {
 
         BomNewEbomEditDetailVO vo = new BomNewEbomEditDetailVO();
         BomNewEbomParentVO parentVO;
-        if (bomRowId == null || bomRowId.longValue() == 0) {
+        if (bomRowId == null || bomRowId == 0) {
 
             BomNewEbomChildEntity child = SpringUtil.getBean(BomNewEbomChildService.class).getBaseMapper().selectById(rowId);
 
@@ -1559,8 +1559,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                     || parentVO.getMaterialCategoryCode().equals("7013")) {
                 ;
             } else {
-                VUtils.isTure(true).throwMessage("编辑条件需满足，1.存在下级物料或是缺BOM 2.物料的分类20且流程类型为外协和采购部分\n" +
-                        " 3.分类70中的7013时的物料 ");
+                VUtils.isTure(true).throwMessage("编辑条件需满足<br/>1.存在下级物料或是缺BOM<br/>2.物料的分类20且流程类型为外协和采购部分<br/>3.分类70中的7013时的物料 ");
             }
             vo.setDatas(new ArrayList<>());
         } else {
@@ -1572,7 +1571,17 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             parentVO.setParentRowId(0L);
             parentVO.setChildBomRowId(rowId);
             materialMainService.intiMaterialInfo(ImmutableList.of(parentVO), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
-            vo.setDatas(getChild(bomRowId));
+            List<BomNewEbomParentVO> childList = getChild(bomRowId);
+            if (hideVirtualPackage == 1) {
+                List<BomNewEbomParentVO> virtualPackageList = childList.stream()
+                        .filter(c -> c.getVirtualPackageIs() == 1 && c.getBomRowId() > 0)
+                        .collect(Collectors.toList());
+                virtualPackageList.forEach(v -> {
+                    childList.remove(v);
+                    childList.addAll(getChild(v.getBomRowId()));
+                });
+            }
+            vo.setDatas(childList);
         }