From 37c720c3fcb991e94900345564ad2614e35930ee Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Sat, 30 Mar 2024 18:54:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/product/bomnew/api/user/EbomApi.java  |  2 +-
 .../bomnew/service/BomNewEbomParentService.java    | 10 +++++-----
 .../bomnew/service/BomNewPbomParentService.java    |  2 +-
 .../service/domain/EBom/VirtualPackageFor21.java   | 14 ++++++++------
 4 files changed, 15 insertions(+), 13 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 3dd97b1d..bd1a5503 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
@@ -124,7 +124,7 @@ public class EbomApi extends BaseApi {
     @ApiOperation("生成虚拟包")
     @LogRecord(success = "生成虚拟包：物料编码：{{#gvbom.materialNo}} 版本：{{#gvbom.currentVersion}},操作结果:{{#_ret}}",
             bizNo = "{{#paramDto.bomRowId}}", type = "生成虚拟包")
-    public ResultVO<Boolean> generateVirtualPackage(@RequestBody VirtualPackageParamDto paramDto) {
+    public ResultVO<Boolean> generateVirtualPackage(@RequestBody VirtualPackageParamDto paramDto) throws IOException {
         VUtils.isTure(CollUtil.isEmpty(paramDto.getVirtualPackageValue())).throwMessage("请选择要生成的虚拟包");
 
         //检查-是否已
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 39959f4a..b2dd9d68 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
@@ -644,8 +644,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
      * @param paramDto
      */
     @Transactional(rollbackFor = Exception.class)
-    public void generateVirtualPackage(VirtualPackageParamDto paramDto) {
-        try {
+    public void generateVirtualPackage(VirtualPackageParamDto paramDto) throws IOException {
+//        try {
             BomNewEbomParentEntity root = this.getById(paramDto.getBomRowId());
             VUtils.isTure(Objects.isNull(root)).throwMessage("Bom不存在");
             VUtils.isTure(!Objects.equals(root.getExceptionStatus(), EBomExceptionStatusEnum.OK.getValue()))
@@ -678,9 +678,9 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 }
 
             }
-        } catch (Exception ex) {
-            throw new NflgBusinessException(STATE.BusinessError, ex.getMessage());
-        }
+//        } catch (Exception ex) {
+//            throw new NflgBusinessException(STATE.BusinessError, ex.getMessage());
+//        }
     }
 
     /**
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index caee4bc6..898af49b 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -595,7 +595,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
     }
 
     public List<BomNewPbomParentVO> getAllocationFactoryBomTree(AllocationFactoryBomQuery param) throws ExecutionException, InterruptedException {
-        List<BomNewPbomParentVO> allBom = getAllBom(param.getBomRowId(), 0);
+        List<BomNewPbomParentVO> allBom = getAllBom(param.getBomRowId(), 1);
         materialMainService.intiMaterialInfo(allBom, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
         return CTreePBomUtils.toTree(param.getBomRowId(), allBom, BomNewPbomParentVO::getParentRowId, BomNewPbomParentVO::getBomRowId);
     }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageFor21.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageFor21.java
index b0d6afa7..f8e0be9b 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageFor21.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageFor21.java
@@ -48,7 +48,7 @@ public class VirtualPackageFor21 extends VirtualPackageBase {
 
 
         BomNewEbomParentEntity makingPackage=null;
-        if((parent.getVirtrualPackageEnum()| VirtualPackageTypeEnum.MAKING_PACKAGE.getValue())!=VirtualPackageTypeEnum.MAKING_PACKAGE.getValue()) {
+        if((parent.getVirtrualPackageEnum()& VirtualPackageTypeEnum.MAKING_PACKAGE.getValue())!=VirtualPackageTypeEnum.MAKING_PACKAGE.getValue()) {
             //构建构建发货包下制作包
             makingPackage = buildParentVirtualPackage( parent.getRowId(), VirtualPackageTypeEnum.MAKING_PACKAGE,"001");
             //构建构建发货包下直发
@@ -69,13 +69,15 @@ public class VirtualPackageFor21 extends VirtualPackageBase {
         }
         List<BomNewEbomParentVO> child = getChild();
          //将产品子级放制作包下
-        for (BomNewEbomParentVO item : child) {
+        if(Objects.nonNull(makingPackage)) {
+            for (BomNewEbomParentVO item : child) {
 
-            BomNewEbomChildEntity itemUp = new BomNewEbomChildEntity();
-            itemUp.setRowId(item.getRowId());
-            itemUp.setParentRowId(makingPackage.getRowId());
-            this.childResult.add(itemUp);
+                BomNewEbomChildEntity itemUp = new BomNewEbomChildEntity();
+                itemUp.setRowId(item.getRowId());
+                itemUp.setParentRowId(makingPackage.getRowId());
+                this.childResult.add(itemUp);
 
+            }
         }
         parent.setVirtrualPackageEnum(virtualPackageValue.stream().collect(Collectors.summingInt(u->u)));
         parentResult.add(parent);