2025-08-14 13:52:08 +08:00
|
|
|
|
package com.klp.controller;
|
|
|
|
|
|
|
2025-08-14 17:59:32 +08:00
|
|
|
|
import java.util.ArrayList;
|
2025-08-14 13:52:08 +08:00
|
|
|
|
import java.util.List;
|
|
|
|
|
|
import java.util.Arrays;
|
2025-08-14 16:35:46 +08:00
|
|
|
|
import java.util.Map;
|
2025-08-14 17:59:32 +08:00
|
|
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
2025-08-14 13:52:08 +08:00
|
|
|
|
|
2025-08-14 17:33:42 +08:00
|
|
|
|
import com.klp.domain.vo.BatchGroupVo;
|
2025-08-14 13:52:08 +08:00
|
|
|
|
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));
|
|
|
|
|
|
}
|
2025-08-14 16:35:46 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
* 生成不会产生死锁的批次分配方案
|
2025-08-14 17:33:42 +08:00
|
|
|
|
* 相同processId的任务会合并到一个批次组中
|
|
|
|
|
|
* 不同processId的任务会放在不同的批次组中
|
2025-08-14 16:35:46 +08:00
|
|
|
|
*
|
|
|
|
|
|
* @param rows 任务执行顺序数组
|
|
|
|
|
|
* @return 批次分配方案
|
|
|
|
|
|
*/
|
|
|
|
|
|
@PostMapping("/generate")
|
2025-08-14 17:33:42 +08:00
|
|
|
|
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的批次组
|
2025-08-14 17:59:32 +08:00
|
|
|
|
List<BatchGroupVo> mergedBatches = new ArrayList<>();
|
|
|
|
|
|
AtomicInteger groupCounter = new AtomicInteger(1);
|
2025-08-14 17:33:42 +08:00
|
|
|
|
|
|
|
|
|
|
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);
|
2025-08-14 16:35:46 +08:00
|
|
|
|
}
|
2025-08-14 17:33:42 +08:00
|
|
|
|
|
|
|
|
|
|
|
2025-08-14 13:52:08 +08:00
|
|
|
|
}
|