From 9e52c71b19d9b6f060ed5ee1e76f2bb4d50ca301 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Fri, 25 Jul 2025 13:36:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E6=B5=81=E7=A8=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/api/service/IApiService.java | 3 +++ .../api/service/impl/ApiServiceImpl.java | 20 ++++++++++++++++--- .../main/java/com/ruoyi/common/Constant.java | 1 + 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java index 5342f8f..b2d41a1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java @@ -12,6 +12,7 @@ import com.ruoyi.api.domain.agv.genAgvSchedulingTask.GenAgvSchedulingTaskRespons import com.ruoyi.api.domain.wcs2wms.MydoJob; import com.ruoyi.common.core.domain.AjaxResult; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -86,4 +87,6 @@ public interface IApiService AjaxResult receiveAgvMoveJob(GenAgvSchedulingTaskRequest genAgvSchedulingTaskRequest); RequestLog finishMydoJob(String agvFinishUrl, String point, Map param); + + public AjaxResult sendOutMydoJobStatus(Map param) ; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java index d8f032f..b799f20 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java @@ -131,12 +131,23 @@ public class ApiServiceImpl implements IApiService { return requestLogService.getRequestLog(AGV_FINISH_URL, "agv任务完成", JSONUtil.toJsonStr(param)); } + @Override + public AjaxResult sendOutMydoJobStatus(Map param) { + RequestLog requestLog = requestLogService.getRequestLog(SEND_OUT_MYDOJOB_STATUS, "发送出库任务状态", JSONUtil.toJsonStr(param)); + if ("1".equals(requestLog.getIsSuccessful())) { + return AjaxResult.success(); + } else { + return AjaxResult.error(); + } + } + private void agvCallbackInfo(AgvCallbackRequest request) { String taskCode = request.getTaskCode(); AgvQueue agvQueue = agvQueueService.selectAgvQueueByTaskCode(taskCode); - + //通知wms agv搬运阶段完成 + Map param = new HashMap<>(); if (ObjUtil.isNotNull(agvQueue)) { switch (request.getMethod()) { case "start": @@ -144,6 +155,10 @@ public class ApiServiceImpl implements IApiService { agvQueue.setStatus("2"); agvQueueService.updateAgvQueue(agvQueue); log.info("【AGV任务开始】任务号：{}", taskCode); + //通知wms + param.put("taskNo", agvQueue.getWmsTaskNo()); + param.put("status","2"); + sendOutMydoJobStatus(param); break; case "outbin": //走出储位 @@ -155,8 +170,7 @@ public class ApiServiceImpl implements IApiService { //任务结束 agvQueue.setStatus("4"); agvQueueService.updateAgvQueue(agvQueue); - //通知wms agv搬运阶段完成 - Map param = new HashMap<>(); + param.put("wmsType", agvQueue.getWmsTaskType()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java b/ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java index 0c00acf..84e59f9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java @@ -26,5 +26,6 @@ public class Constant { public static final String CONTINUE_TASK_URL = "http://127.0.0.1:8081/rcms-dps/rest/queryAgvStatus/"; public static final String CANCEL_TASK_URL = "http://127.0.0.1:8081/rcms-dps/rest/queryAgvStatus/"; public static final String GEN_AGV_SCHEDULING_TASK = "http://127.0.0.1:8081/rcms-dps/rest/queryAgvStatus/"; + public static final String SEND_OUT_MYDOJOB_STATUS = "http://127.0.0.1:8080/api2wms/startSignal"; }