lhq/FT501-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

作废任务对外接口

Browse Source
This commit is contained in:
liuhanqing
2025-08-04 17:50:13 +08:00
parent 1a3ad173c3
commit 4547502ca6
4 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-admin/src/main/java/com/ruoyi/api/controller/Wcs2WmsController.java
View File

@@ -45,4 +45,14 @@ public class Wcs2WmsController {
public AjaxResult outMydojobMakesure(@RequestBody MydoJob mydoJob) {
return apiService.outMydojobMakesure(mydoJob);
}
/**
* 取消ctu任务
* @param mydoJob
* @return
*/
@PostMapping("/cancelMydoJob")
public AjaxResult cancelMydoJob(@RequestBody MydoJob mydoJob) {
return apiService.cancelMydoJob(mydoJob);
}
}

6
ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java
View File

@@ -129,4 +129,10 @@ public interface IApiService
* @return
*/
AjaxResult outMydojobMakesure(MydoJob mydoJob);
/**
* 取消ctu任务
* @param mydoJob
* @return
*/
AjaxResult cancelMydoJob(MydoJob mydoJob);
}

22
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
View File

@@ -358,6 +358,28 @@ public class ApiServiceImpl implements IApiService {
return AjaxResult.success();
}
@Override
public AjaxResult cancelMydoJob(MydoJob mydoJob) {
AgvQueue param = new AgvQueue();
param.setWmsTaskNo(mydoJob.getTaskNo());
for (AgvQueue agvQueue : agvQueueService.selectAgvQueueList(param)) {
CancelTaskRequest cancelTaskRequest = new CancelTaskRequest();
cancelTaskRequest.setTaskCode(agvQueue.getTaskCode());
CancelTaskResponse cancelTaskResponse = cancelTask(cancelTaskRequest);
if (cancelTaskResponse.getCode() == 0){
agvQueue.setStatus("5");
agvQueueService.updateAgvQueue(agvQueue);
//插入历史
agvQueueService.insertHistory(agvQueue.getReqCode());
//删除队列
agvQueueService.deleteAgvQueueByReqCode(agvQueue.getReqCode());
log.info("【AGV任务单取消】 wms任务号：{} agv任务号：{}", agvQueue.getWmsTaskNo(), agvQueue.getTaskCode());
}
}
return AjaxResult.success();
}
/**
* 生成agv队列

27
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsOutSsjThread.java
View File

@@ -145,31 +145,4 @@ public class BsOutSsjThread implements Runnable {
}
}
}
/**
* 请求海康生成agv任务,并修改wms任务状态
* @param agvQueue
*/
private void requestAgvQueue(AgvQueue agvQueue) {
//请求ctu
GenAgvSchedulingTaskRequest genAgvSchedulingTaskRequest = new GenAgvSchedulingTaskRequest();
genAgvSchedulingTaskRequest.setReqCode(agvQueue.getReqCode());
genAgvSchedulingTaskRequest.setTaskMode("0");
genAgvSchedulingTaskRequest.setPriority("10");
genAgvSchedulingTaskRequest.setTaskTyp("F01");
genAgvSchedulingTaskRequest.setCtnrCode("0");
genAgvSchedulingTaskRequest.setCtnrNum("0");
genAgvSchedulingTaskRequest.setTaskMode("0");
genAgvSchedulingTaskRequest.setTaskCode(agvQueue.getTaskCode());
genAgvSchedulingTaskRequest.setGroupId(agvQueue.getWmsTaskNo());
genAgvSchedulingTaskRequest.setAgvTyp("CTU");
genAgvSchedulingTaskRequest.setPositionSelStrategy("0");
GenAgvSchedulingTaskResponse genAgvSchedulingTaskResponse = apiService.genAgvSchedulingTask(genAgvSchedulingTaskRequest);
if (genAgvSchedulingTaskResponse.getCode() == 0){
//修改ctu执行状态
agvQueue.setStatus("1");
agvQueueService.updateAgvQueue(agvQueue);
log.info("向CTU下入库库作业");
}
}
}