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 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{ - + try { + List allBom = this.getAllBomTree(k.getBomRowId()); + List 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> stringListMap = ListCommonUtil.listGroupMap(params.equals(), SaveAllocationFactoryDTO::getProductionFactoryCode); -// for (Map.Entry> entry : stringListMap.entrySet()) { -// List saveList = entry.getValue(); -// List rowIds = saveList.stream().map(u -> u.getRowId()).collect(Collectors.toList()); -// pbomChildService.getBaseMapper().setProductionFactoryCode(entry.getKey(), rowIds); -// } return true; }