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 518cb6c2..ec03c430 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 @@ -211,6 +211,14 @@ public class PBomApi extends BaseApi { return ResultVO.success(bomNewPbomParentService.saveAllocationFactory(params)); } + @PostMapping("saveAllocationFactoryNew") + @ApiOperation("分工厂-保存") + @LogRecord(success = "PBom-分工厂-保存。操作结果:{{#_ret}}", bizNo = "",type = "PBom-分工厂-保存") + public ResultVO saveAllocationFactory(@Valid @RequestBody AllocationFactoryParam params){ + + return ResultVO.success(bomNewPbomParentService.saveAllocationFactory(params)); + } + @PostMapping("allocationFactoryForRel") @ApiOperation("分工厂-规则匹配") @LogRecord(success = "PBom-分工厂-规则匹配,物料编码:{{#bom.materialNo}}-版本:{{#bom.currentVersion}}-规则编码:{{#params.ruleGroupCode}} 操作结果:{{#_ret}}", bizNo = "{{#params.bomRowId}}",type = "PBom-分工厂-规则匹配") diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/AllocationFactoryParam.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/AllocationFactoryParam.java new file mode 100644 index 00000000..56a61974 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/AllocationFactoryParam.java @@ -0,0 +1,19 @@ +package com.nflg.product.bomnew.pojo.dto; + +import com.nflg.product.bomnew.service.BomNewLogService; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 分工厂 + */ +@Data +public class AllocationFactoryParam { + + List data; + + @ApiModelProperty("是否设置下级 0-否 1-是") + private Integer setSubNode; +} 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 71b50a4d..df0a22b0 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 @@ -612,6 +612,26 @@ public class BomNewPbomParentService extends ServiceImpl{ + + }); + } +// 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; + } + public Boolean allocationFactoryForRel(AllocationFactoryForRelDTO params) throws ExecutionException, InterruptedException { VUtils.isTure(StrUtil.isBlank(params.getRuleGroupCode())).throwMessage("规则编码不能为空");