Files
klp-oa/klp-wms/src/main/java/com/klp/controller/WmsBatchController.java

145 lines
5.0 KiB
Java
Raw Normal View History

package com.klp.controller;
import java.util.List;
import java.util.Arrays;
import java.util.Map;
import com.klp.domain.vo.BatchGroupVo;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.domain.vo.WmsBatchVo;
import com.klp.domain.bo.WmsBatchBo;
import com.klp.service.IWmsBatchService;
import com.klp.common.core.page.TableDataInfo;
/**
* 批次合并相同工艺的任务
*
* @author klp
* @date 2025-08-14
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/klp/batch")
public class WmsBatchController extends BaseController {
private final IWmsBatchService iWmsBatchService;
/**
* 查询批次合并相同工艺的任务列表
*/
@GetMapping("/list")
public TableDataInfo<WmsBatchVo> list(WmsBatchBo bo, PageQuery pageQuery) {
return iWmsBatchService.queryPageList(bo, pageQuery);
}
/**
* 导出批次合并相同工艺的任务列表
*/
@Log(title = "批次(合并相同工艺的任务)", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(WmsBatchBo bo, HttpServletResponse response) {
List<WmsBatchVo> list = iWmsBatchService.queryList(bo);
ExcelUtil.exportExcel(list, "批次(合并相同工艺的任务)", WmsBatchVo.class, response);
}
/**
* 获取批次合并相同工艺的任务详细信息
*
* @param batchId 主键
*/
@GetMapping("/{batchId}")
public R<WmsBatchVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long batchId) {
return R.ok(iWmsBatchService.queryById(batchId));
}
/**
* 新增批次合并相同工艺的任务
*/
@Log(title = "批次(合并相同工艺的任务)", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsBatchBo bo) {
return toAjax(iWmsBatchService.insertByBo(bo));
}
/**
* 修改批次合并相同工艺的任务
*/
@Log(title = "批次(合并相同工艺的任务)", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsBatchBo bo) {
return toAjax(iWmsBatchService.updateByBo(bo));
}
/**
* 删除批次合并相同工艺的任务
*
* @param batchIds 主键串
*/
@Log(title = "批次(合并相同工艺的任务)", businessType = BusinessType.DELETE)
@DeleteMapping("/{batchIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] batchIds) {
return toAjax(iWmsBatchService.deleteWithValidByIds(Arrays.asList(batchIds), true));
}
/**
* 生成不会产生死锁的批次分配方案
* 相同processId的任务会合并到一个批次组中
* 不同processId的任务会放在不同的批次组中
*
* @param rows 任务执行顺序数组
* @return 批次分配方案
*/
@PostMapping("/generate")
public R<List<BatchGroupVo>> generateNonDeadlockBatches(@RequestBody List<List<Map<String, Object>>> rows) {
// 先获取原始的批次分配方案
List<BatchGroupVo> originalBatches = iWmsBatchService.generateNonDeadlockBatches(rows);
// 使用Java 8 Stream API按processId分组并合并任务
Map<String, List<BatchGroupVo>> groupedByProcessId = originalBatches.stream()
.collect(java.util.stream.Collectors.groupingBy(BatchGroupVo::getProcessId));
// 合并相同processId的批次组
List<BatchGroupVo> mergedBatches = new java.util.ArrayList<>();
java.util.concurrent.atomic.AtomicInteger groupCounter = new java.util.concurrent.atomic.AtomicInteger(1);
groupedByProcessId.forEach((processId, groups) -> {
// 创建一个新的合并后的批次组
BatchGroupVo mergedGroup = new BatchGroupVo();
mergedGroup.setGroupId("Merged-Group-" + groupCounter.getAndIncrement());
mergedGroup.setProcessId(processId);
// 合并所有taskIds
List<String> allTaskIds = groups.stream()
.flatMap(group -> group.getTaskIds().stream())
.collect(java.util.stream.Collectors.toList());
mergedGroup.setTaskIds(allTaskIds);
mergedBatches.add(mergedGroup);
});
return R.ok(mergedBatches);
}
}