From 548ecba0a4a241297364991b07b9ef0a8d7e0961 Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Mon, 4 Mar 2024 21:25:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/api/user/PBomApi.java |  4 ++--
 .../pojo/dto/SaveAllocationFactoryDTO.java    |  3 +++
 .../service/BomNewPbomParentService.java      | 19 ++++++++++++-------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
index ec03c430..302f2ab9 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
@@ -212,11 +212,11 @@ public class PBomApi extends BaseApi {
     }
 
     @PostMapping("saveAllocationFactoryNew")
-    @ApiOperation("分工厂-保存")
+    @ApiOperation("分工厂-批量保存保存")
     @LogRecord(success = "PBom-分工厂-保存。操作结果:{{#_ret}}", bizNo = "",type = "PBom-分工厂-保存")
     public  ResultVO<Boolean> saveAllocationFactory(@Valid @RequestBody AllocationFactoryParam params){
 
-        return ResultVO.success(bomNewPbomParentService.saveAllocationFactory(params));
+        return ResultVO.success(bomNewPbomParentService.saveAllocationFactoryNew(params));
     }
 
     @PostMapping("allocationFactoryForRel")
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/SaveAllocationFactoryDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/SaveAllocationFactoryDTO.java
index ffc2576a..51a8ac76 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/SaveAllocationFactoryDTO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/SaveAllocationFactoryDTO.java
@@ -15,6 +15,9 @@ public class SaveAllocationFactoryDTO {
     @NotNull(message = "bom明细行ID不能为空")
     private Long rowId;
 
+    @ApiModelProperty("bom版本行ID")
+    private Long bomRowId;
+
     @ApiModelProperty("生产工厂")
     @NotNull(message = "生产工厂不能为空")
     private String productionFactoryCode;
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 df0a22b0..964caca9 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
@@ -620,15 +620,20 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
           return   saveAllocationFactory(params.getData());
         }else {
             params.getData().forEach(k->{
-
+                try {
+                    List<BomNewPbomParentVO> allBom = this.getAllBomTree(k.getBomRowId());
+                    List<Long> rowIds = allBom.stream().map(u -> u.getRowId()).collect(Collectors.toList());
+                    if(CollUtil.isNotEmpty(rowIds)) {
+                        pbomChildService.getBaseMapper().setProductionFactoryCode(k.getProductionFactoryCode(), rowIds);
+                    }
+                    
+                } catch (ExecutionException e) {
+                    e.printStackTrace();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
             });
         }
-//        Map<String, List<SaveAllocationFactoryDTO>> stringListMap = ListCommonUtil.listGroupMap(params.equals(), SaveAllocationFactoryDTO::getProductionFactoryCode);
-//        for (Map.Entry<String, List<SaveAllocationFactoryDTO>> entry : stringListMap.entrySet()) {
-//            List<SaveAllocationFactoryDTO> saveList = entry.getValue();
-//            List<Long> rowIds = saveList.stream().map(u -> u.getRowId()).collect(Collectors.toList());
-//            pbomChildService.getBaseMapper().setProductionFactoryCode(entry.getKey(), rowIds);
-//        }
         return true;
     }