请求取消AGV作业

ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWcsService.java

@@ -40,6 +40,8 @@ public interface IToWcsService {
      */
     AjaxResult cancelTaskByTaskNo(String taskNo);
 
+    AjaxResult cancelRcsTaskBytaskCode(String taskCode);
+
 
     AjaxResult selectWcsPort();
 

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java

@@ -42,6 +42,9 @@ public class ToWcsServiceImpl implements IToWcsService {
     public static final String SELECT_WCS_PORT = wcsUrl + "/wcs2Wms/api/selectWcsPort";
     public static final String UPDATE_WCS_PORT = wcsUrl + "/wcs2Wms/api/updateWcsPort";
 
+    //@@@
+    public static final String CANCEL_AGV_TASK = wcsUrl + "/agv/api/cancelTask";
+
 
     @Override
     @Scheduled(fixedDelay=1500)
@@ -125,6 +128,24 @@ public class ToWcsServiceImpl implements IToWcsService {
         Map<String,String> map = new HashMap<>();
         map.put("taskNo", taskNo);
         RequestLog requestLog = requestLogService.getRequestLog(CANCEL_MYDOJOB, JSONUtil.toJsonStr(map), "取消任务","wms","wcs");
+
+        //@@@
+        RequestLog requestLog1 = requestLogService.getRequestLog(CANCEL_AGV_TASK, JSONUtil.toJsonStr(map), "取消任务","wms","wcs");
+
+        if ("1".equals(requestLog.getIsSuccessful())){
+            return AjaxResult.success();
+        }
+        return AjaxResult.error(requestLog.getErrorDetails());
+    }
+
+    @Override
+    public AjaxResult cancelRcsTaskBytaskCode(String taskCode) {
+        Map<String,String> map = new HashMap<>();
+        map.put("taskCode", taskCode);
+
+        //@@@
+        RequestLog requestLog = requestLogService.getRequestLog(CANCEL_AGV_TASK, JSONUtil.toJsonStr(map), "取消任务","wms","wcs");
+
         if ("1".equals(requestLog.getIsSuccessful())){
             return AjaxResult.success();
         }

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java

@@ -199,9 +199,14 @@ public class MydoJobServiceImpl implements IMydoJobService {
             BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(job.getCargoSpaceId());
             basCargoSpace.setStatus("1");
             basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
+
+            //@@@
+            iToWcsService.cancelRcsTaskBytaskCode(mydoJob.getJobId());
+
             //插入历史表
             insertHistory(mydoJob.getJobId());
 
+
         } else if ("2".equals(job.getInOrOut())|| "3".equals(job.getInOrOut()) || "5".equals(job.getInOrOut())) {
             MydoJobDetail param = new MydoJobDetail();
             param.setJobId(jobId);
@@ -224,6 +229,10 @@ public class MydoJobServiceImpl implements IMydoJobService {
             mydoJob.setStatus("5");
             mydoJob.setFinishTime(DateUtil.formatDateTime(new Date()));
             updateMydoJob(mydoJob);
+
+            //@@@
+            iToWcsService.cancelRcsTaskBytaskCode(mydoJob.getJobId());
+
             //插入历史表
             insertHistory(mydoJob.getJobId());
         }
@@ -357,6 +366,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
                 transferBillCallback.setSpare3(mydoJobDetails.get(0).getSpec());
                 transferBillCallback.setTrayCode(mydoJob.getTrayCode());
                 transferBillCallbackService.insertTransferBillCallback(transferBillCallback);
+
                 return AjaxResult.success();
             } else {
                 return AjaxResult.warn("不存在子作业");