From a1d219ec6b30d5719fc8cfadbe397528bc6f8b9f Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 2 Jul 2025 17:03:49 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E5=8D=B7=E5=8F=B7=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=B0=E4=BB=BB=E5=8A=A1=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java | 3 ++- .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java index 50ec0ac7c..748ee407c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java @@ -95,7 +95,7 @@ public class AutoSendAirShaftAgvTask { } else { log.info("异常处理位无空位！"); // 点位禁用 - cutPoint.setRemark("计划状态已被改变！"); + cutPoint.setRemark("找不到分切计划！"); cutPoint.setUpdate_time(DateUtil.now()); bcutpointivtService.updateById(cutPoint); } @@ -154,6 +154,7 @@ public class AutoSendAirShaftAgvTask { param.put("vehicle_code2", cutPoint.getQzz_no2()); param.put("task_type", SlitterEnum.TASK_TYPE.code("送气胀轴到分切机任务")); param.put("product_area", SlitterConstant.SLITTER_TASK_AREA); + param.put("containers", plans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList())); sendAirShaftAgvTask.createTask(param); } else { throw new BadRequestException("系统繁忙，稍后在试!"); 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 8f84eb584..f2e9fbab7 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 @@ -668,6 +668,7 @@ public class SlitterServiceImpl implements SlitterService { TaskUtils.updateOptMessageBySlitterPlan(plan); }); // 创建任务 + taskParam.put("d_containers", currentPlans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList())); slitterDownTrussTask.createTask(taskParam); slittingproductionplanService.updateBatchById(currentPlans); return res; @@ -742,6 +743,8 @@ public class SlitterServiceImpl implements SlitterService { // 创建任务 taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("分切机下料桁架任务")); taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); + taskParam.put("d_containers", currentPlans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList())); + taskParam.put("u_containers", nextPlans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList())); slitterDownTrussTask.createTask(taskParam); // 下来的分切计划修改状态：05 -> 06 currentPlans.forEach(plan -> { @@ -1942,7 +1945,7 @@ public class SlitterServiceImpl implements SlitterService { taskParam.put("empty_site", "0"); taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("分切机上气胀轴")); taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); - + taskParam.put("u_containers", plans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList())); // 创建任务 upShaftTrussTask.createTask(taskParam); res.put("msg", containers);