From 2796967be0f0be0ca2d106532c4f8f871a19091d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Fri, 31 Oct 2025 23:04:58 +0800 Subject: [PATCH] =?UTF-8?q?agv=E4=BB=BB=E5=8A=A1=E5=A4=A7=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../automatedWarehouse/controller/AgvTaskController.java | 9 +++++++-- .../automatedWarehouse/service/AgvTaskService.java | 3 ++- .../service/impl/AgvTaskServiceImpl.java | 7 ++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/controller/AgvTaskController.java b/src/main/java/com/gaotao/modules/automatedWarehouse/controller/AgvTaskController.java index fbcb06d..9335b23 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/controller/AgvTaskController.java +++ b/src/main/java/com/gaotao/modules/automatedWarehouse/controller/AgvTaskController.java @@ -99,19 +99,24 @@ public class AgvTaskController { /** * @Description 取消AGV运输任务 - rqrq * @Title cancelTuskTask - * @param params 包含任务号的参数 + * @param params 包含工厂编码和任务号的参数 * @return 操作结果 * @author rqrq * @date 2025/10/31 */ @PostMapping("/cancelTuskTask") public R cancelTuskTask(@RequestBody Map params) throws Exception { + String site = (String) params.get("site"); String taskNo = (String) params.get("taskNo"); + + if (site == null || site.trim().isEmpty()) { + return R.error("工厂编码不能为空"); + } if (taskNo == null || taskNo.trim().isEmpty()) { return R.error("任务单号不能为空"); } - CancelTaskResult result = agvTaskService.cancelAgvTask(taskNo); + CancelTaskResult result = agvTaskService.cancelAgvTask(site, taskNo); if (result.isSuccess()) { R r = R.ok().put("msg", result.getMessage()); diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/AgvTaskService.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/AgvTaskService.java index f69a815..620fe90 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/AgvTaskService.java +++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/AgvTaskService.java @@ -75,10 +75,11 @@ public interface AgvTaskService { /** * @Description 取消AGV运输任务 - rqrq * @Title cancelAgvTask + * @param site 工厂编码 * @param taskNo 任务单号 * @return 取消结果（包含WCS接口调用状态和资源恢复情况） * @author rqrq * @date 2025/10/31 */ - CancelTaskResult cancelAgvTask(String taskNo); + CancelTaskResult cancelAgvTask(String site, String taskNo); } diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AgvTaskServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AgvTaskServiceImpl.java index ad29453..062c1ec 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AgvTaskServiceImpl.java +++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AgvTaskServiceImpl.java @@ -445,6 +445,7 @@ public class AgvTaskServiceImpl implements AgvTaskService { /** * @Description 取消AGV运输任务 - rqrq * @Title cancelAgvTask + * @param site 工厂编码 * @param taskNo 任务单号 * @return 取消结果（包含WCS接口调用状态和资源恢复情况） * @author rqrq @@ -452,12 +453,12 @@ public class AgvTaskServiceImpl implements AgvTaskService { */ @Override @Transactional(rollbackFor = Exception.class) - public CancelTaskResult cancelAgvTask(String taskNo) { - System.out.println("开始取消AGV任务 - rqrq，taskNo=" + taskNo); + public CancelTaskResult cancelAgvTask(String site, String taskNo) { + System.out.println("开始取消AGV任务 - rqrq，site=" + site + "，taskNo=" + taskNo); try { // 1. 查询主任务 - rqrq - WmsTransportTask task = agvTaskMapper.getTaskByTaskNo("1000", taskNo); + WmsTransportTask task = agvTaskMapper.getTaskByTaskNo(site, taskNo); if (task == null) { System.out.println("任务不存在 - rqrq，taskNo=" + taskNo); return new CancelTaskResult(false, "任务不存在");