Skip to content

H
HYH.APSJ
Commit 9fab7eca authored by DESKTOP-VKRD9QF\Administration's avatar DESKTOP-VKRD9QF\Administration
Browse files
Options

插单修改

parent a84189b4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 505 additions and 53 deletions
src/main/java/com/aps/controller/gantt/ResourceGanttController.java
View file @ 9fab7eca
...@@ -418,6 +418,58 @@ public class ResourceGanttController { ...@@ -418,6 +418,58 @@ public class ResourceGanttController {
return R.ok("插单成功"); return R.ok("插单成功");
} }
@PostMapping("/orderInsertAuto")
@Operation(
summary = "自动插单",
description = "创建新工单并按基准时间+冻结期自动排程。若锚点被占用，则占位工单及后续工单后移；若前面有空挡，新工单自动前移到设备最早可用时间",
requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(
description = "自动插单参数",
required = true,
content = @io.swagger.v3.oas.annotations.media.Content(
mediaType = "application/json",
examples = {
@io.swagger.v3.oas.annotations.media.ExampleObject(
name = "自动插单示例",
summary = "基础示例",
value = "{\n" +
" \"sceneId\": \"B571EF6682DB463AB2977B1055A74112\",\n" +
" \"newOrder\": {\n" +
" \"orderCode\": \"AUTO_20260326_001\",\n" +
" \"materialId\": \"d5d0dd08-cfb5-2b45-85e9-aba470895423\",\n" +
" \"quantity\": 610000\n" +
" }\n" +
"}"
),
@io.swagger.v3.oas.annotations.media.ExampleObject(
name = "大批量示例",
summary = "大批量订单",
value = "{\n" +
" \"sceneId\": \"B571EF6682DB463AB2977B1055A74112\",\n" +
" \"newOrder\": {\n" +
" \"orderCode\": \"AUTO_20260326_002\",\n" +
" \"materialId\": \"cbd0dd08-49b1-0146-83bd-ec6185316c16\",\n" +
" \"quantity\": 1200000\n" +
" }\n" +
"}"
)
}
)
)
)
public R<String> insertOrderAuto(@RequestBody Map<String, Object> params) {
log.info("insertOrderAuto 请求参数: {}", params);
String sceneId = ParamValidator.getString(params, "sceneId", "场景ID");
@SuppressWarnings("unchecked")
Map<String, Object> newOrderData = (Map<String, Object>) params.get("newOrder");
ParamValidator.validateSceneExists(sceneService, sceneId);
planResultService.InsertOrderAuto(sceneId, newOrderData);
return R.ok("自动插单成功");
}
@PostMapping("/ordermerge") @PostMapping("/ordermerge")
@Operation(summary = "订单合并", description = "订单合并") @Operation(summary = "订单合并", description = "订单合并")
public R<String> orderMerge(@RequestBody Map<String, Object> params) { public R<String> orderMerge(@RequestBody Map<String, Object> params) {
......
src/main/java/com/aps/service/plan/PlanResultService.java
View file @ 9fab7eca
...@@ -1340,74 +1340,110 @@ public class PlanResultService { ...@@ -1340,74 +1340,110 @@ public class PlanResultService {
return releasedCount; return releasedCount;
} }
public Chromosome InsertOrderAuto(String sceneId, Map<String, Object> newOrderData) {
private long countMachineAvailabilitySegments(Chromosome chromosome, Long machineId) { if (newOrderData == null) {
if (chromosome == null || machineId == null || chromosome.getInitMachines() == null) { throw new RuntimeException("newOrder 不能为空");
return 0;
} }
return chromosome.getInitMachines().stream() String orderCode = String.valueOf(newOrderData.get("orderCode"));
.filter(Objects::nonNull) String materialId = String.valueOf(newOrderData.get("materialId"));
.filter(m -> m.getId() == machineId) Object qtyObj = newOrderData.get("quantity");
.findFirst() if (orderCode == null || orderCode.trim().isEmpty()) {
.map(m -> m.getAvailability() == null ? 0L : (long) m.getAvailability().size()) throw new RuntimeException("orderCode 不能为空");
.orElse(0L); }
} if (materialId == null || materialId.trim().isEmpty()) {
throw new RuntimeException("materialId 不能为空");
}
if (qtyObj == null) {
throw new RuntimeException("quantity 不能为空");
}
Double quantity = Double.valueOf(String.valueOf(qtyObj));
private long countMachineUsedMaintenanceSegments(Chromosome chromosome, Long machineId) { // 1. 创建新订单（沿用现有创建逻辑）
if (chromosome == null || machineId == null || chromosome.getInitMachines() == null) { R<String> insertResp = lanuchService.insertOrder(sceneId, orderCode, materialId, null, null, 1, quantity);
return 0; String insertMsg = insertResp != null ? insertResp.getData() : null;
if (insertMsg == null || insertMsg.trim().isEmpty()) {
throw new RuntimeException("创建订单失败：未返回订单ID");
} }
return chromosome.getInitMachines().stream() String newOrderId = insertMsg;
.filter(Objects::nonNull) if (insertMsg.contains("订单ID:")) {
.filter(m -> m.getId() == machineId) newOrderId = insertMsg.substring(insertMsg.indexOf("订单ID:") + 5).trim();
.findFirst() }
.map(m -> m.getAvailability() == null ? 0L : m.getAvailability().stream()
.filter(Objects::nonNull)
.filter(seg -> seg.getType() == SegmentType.MAINTENANCE && seg.isUsed())
.count())
.orElse(0L);
}
private long countMachineUsedSegments(Chromosome chromosome, Long machineId, SegmentType type) { // 2. 读取场景排产结果
if (chromosome == null || machineId == null || chromosome.getInitMachines() == null) { Chromosome chromosome = _sceneService.loadChromosomeFromFile(sceneId);
return 0; if (chromosome == null) {
throw new RuntimeException("场景不存在或排产结果未初始化");
} }
return chromosome.getInitMachines().stream() // 3. 查询新订单及其工序
.filter(Objects::nonNull) ProdLaunchOrder newLaunchOrder = _prodLaunchOrderService.lambdaQuery()
.filter(m -> m.getId() == machineId) .eq(ProdLaunchOrder::getSceneId, sceneId)
.findFirst() .eq(ProdLaunchOrder::getOrderId, newOrderId)
.map(m -> m.getAvailability() == null ? 0L : m.getAvailability().stream() .one();
.filter(Objects::nonNull) if (newLaunchOrder == null) {
.filter(TimeSegment::isUsed) throw new RuntimeException("新订单不存在：" + newOrderId);
.filter(seg -> type == null || seg.getType() == type) }
.count())
.orElse(0L);
}
private String machineSegmentSnapshot(Chromosome chromosome, Long machineId, int limit) { List<ProdProcessExec> newProcessExecs = _prodProcessExecService.lambdaQuery()
if (chromosome == null || machineId == null || chromosome.getInitMachines() == null) { .eq(ProdProcessExec::getSceneId, sceneId)
return "[]"; .eq(ProdProcessExec::getOrderId, newOrderId)
.orderByAsc(ProdProcessExec::getTaskSeq)
.list();
if (newProcessExecs == null || newProcessExecs.isEmpty()) {
throw new RuntimeException("新订单没有工序：" + newOrderId);
} }
Machine machine = chromosome.getInitMachines().stream() // 3.1 查询新工序对应设备（与InitEntrys对齐：execId -> prod_equipment）
List<String> execIds = newProcessExecs.stream()
.map(ProdProcessExec::getExecId)
.filter(Objects::nonNull) .filter(Objects::nonNull)
.filter(m -> m.getId() == machineId) .distinct()
.findFirst() .collect(Collectors.toList());
.orElse(null);
List<ProdEquipment> newProdEquipments = execIds.isEmpty()
? new ArrayList<>()
: _prodEquipmentService.lambdaQuery()
.eq(ProdEquipment::getSceneId, sceneId)
.in(ProdEquipment::getExecId, execIds)
.list();
if (machine == null || machine.getAvailability() == null || machine.getAvailability().isEmpty()) { if (newProdEquipments == null || newProdEquipments.isEmpty()) {
return "[]"; throw new RuntimeException("自动插单失败：新工单未生成可选设备，请检查PROD_EQUIPMENT");
} }
return machine.getAvailability().stream() // 4. 计算锚点时间：基准时间 + 冻结期
.filter(Objects::nonNull) LocalDateTime baseTime = chromosome.getBaseTime();
.sorted(Comparator.comparing(TimeSegment::getStart)) LambdaQueryWrapper<ApsTimeConfig> queryWrapper = new LambdaQueryWrapper<>();
.limit(Math.max(limit, 1)) ApsTimeConfig apsTimeConfig = apsTimeConfigMapper.selectOne(queryWrapper);
.map(seg -> String.format("%s|used=%s|%s~%s", seg.getType(), seg.isUsed(), seg.getStart(), seg.getEnd())) long freezeSeconds = 0L;
.collect(Collectors.joining("; ")); if (apsTimeConfig != null && apsTimeConfig.getFreezeDate() != null) {
freezeSeconds = apsTimeConfig.getFreezeDate().longValue();
}
if (apsTimeConfig != null && apsTimeConfig.getBaseTime() != null) {
baseTime = apsTimeConfig.getBaseTime();
}
LocalDateTime anchorTime = baseTime.plusSeconds(Math.max(freezeSeconds, 0L));
// 5. 自动插单（占位后推 + 空挡前移）
GlobalParam globalParam = InitGlobalParam();
ScheduleOperationService scheduleOperation = new ScheduleOperationService(materialRequirementService, this);
scheduleOperation.InsertOrderAuto(
chromosome,
newOrderId,
newLaunchOrder,
newProcessExecs,
newProdEquipments,
anchorTime,
globalParam
);
// 6. 保存
WriteScheduleSummary(chromosome);
_sceneService.saveChromosomeToFile(chromosome, sceneId);
return chromosome;
} }
public Chromosome Move(String SceneId,List<Integer> opId, LocalDateTime newStartTime, public Chromosome Move(String SceneId,List<Integer> opId, LocalDateTime newStartTime,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment