调度流程修改

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<String, Object> param);
+
+    public AjaxResult sendOutMydoJobStatus(Map<String, Object> param) ;
 }

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<String, Object> 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<String, Object> 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<String, Object> param = new HashMap<>();
+
 
                     param.put("wmsType", agvQueue.getWmsTaskType());
 

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";
 
 }