diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendDisassemblyAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendDisassemblyAgvTask.java index 0be1c6780..b71afc1d5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendDisassemblyAgvTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendDisassemblyAgvTask.java @@ -138,15 +138,16 @@ public class SendDisassemblyAgvTask extends AbstractAcsTask { JSONObject trussTaskParam = new JSONObject(); if (ObjectUtil.isNotEmpty(task.getVehicle_code()) && ObjectUtil.isNotEmpty(task.getVehicle_code2())) { if (list.size() < 2) { + log.info("原地等待,无可用架子..."); // 原地等待 // 分切计划状态修改02->03 - List collect = Stream.of(task.getVehicle_code(), task.getVehicle_code2()) - .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); - PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan(); - p.setStatus("03"); - TaskUtils.updateOptMessageBySlitterPlan(p); - slittingproductionplanService.update(p, new LambdaQueryWrapper() - .in(PdmBiSlittingproductionplan::getQzzno, collect)); +// List collect = Stream.of(task.getVehicle_code(), task.getVehicle_code2()) +// .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); +// PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan(); +// p.setStatus("03"); +// TaskUtils.updateOptMessageBySlitterPlan(p); +// slittingproductionplanService.update(p, new LambdaQueryWrapper() +// .in(PdmBiSlittingproductionplan::getQzzno, collect)); return; } Deliverycachepointivt d1 = list.get(0); @@ -164,15 +165,16 @@ public class SendDisassemblyAgvTask extends AbstractAcsTask { trussDisassemblyCacheTask.createTask(trussTaskParam); } else { if (list.isEmpty()) { + log.info("原地等待,无可用架子..."); // 原地等待 // 分切计划状态修改02->03 - List collect = Stream.of(task.getVehicle_code(), task.getVehicle_code2()) - .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); - PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan(); - p.setStatus("03"); - TaskUtils.updateOptMessageBySlitterPlan(p); - slittingproductionplanService.update(p, new LambdaQueryWrapper() - .in(PdmBiSlittingproductionplan::getQzzno, collect)); +// List collect = Stream.of(task.getVehicle_code(), task.getVehicle_code2()) +// .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); +// PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan(); +// p.setStatus("03"); +// TaskUtils.updateOptMessageBySlitterPlan(p); +// slittingproductionplanService.update(p, new LambdaQueryWrapper() +// .in(PdmBiSlittingproductionplan::getQzzno, collect)); return; } // 两点 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussDisassemblyCacheTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussDisassemblyCacheTask.java index 1512f8d56..b3707fcf7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussDisassemblyCacheTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussDisassemblyCacheTask.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; /** - * + * 拆单桁架任务 * @Author: liyongde * @Date: 2026/4/21 16:07 */ diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index e3e55e2f7..c39280c1d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -2426,6 +2426,7 @@ public class SlitterServiceImpl implements SlitterService { // 2. 查询缓存点位 + 可用点位 List cachePointList = slitterMapper.getReadyShaftCachePointByDevice(deviceInfo); List cutPointList = slitterMapper.getReadyShaftPoint(deviceCode); + // todo: 暂不考虑都有的情况,如果考虑,需要加判断谁的更新时间最早 // 3. 业务分支处理 if (!cachePointList.isEmpty()) {