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

agv搬运任务

Browse Source
This commit is contained in:
liuhanqing
2025-08-08 15:10:27 +08:00
parent 2576ab4dbf
commit 836163c8d9
5 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ruoyi-admin/src/main/java/com/ruoyi/api/controller/AgvController.java
View File

@@ -13,6 +13,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
/**
* Agv操作请求
*/
@@ -42,10 +44,25 @@ public class AgvController extends BaseController {
* agv搬运作业
* @param genAgvSchedulingTaskRequest
* @return
*/
@PostMapping("/receiveAgvMoveJob")
public AjaxResult receiveAgvMoveJob(@RequestBody GenAgvSchedulingTaskRequest genAgvSchedulingTaskRequest) {
return apiService.receiveAgvMoveJob(genAgvSchedulingTaskRequest);
}*/
/**
* agv搬运作业
* @param param{
* startPoint:起始点
* endPoint:结束点
* containerCode:容器编号
* taskNo:任务号
* }
* @return
*/
@PostMapping("/receiveAgvMoveJob")
public AjaxResult receiveAgvMoveJob(@RequestBody Map<String, String> param) {
return apiService.receiveAgvMoveJob(param);
}
}

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

@@ -18,6 +18,7 @@ public class Wcs2WmsController {
/**
* 接收出库任务
*
* @param mydoJob
* @return
*/
@@ -28,6 +29,7 @@ public class Wcs2WmsController {
/**
* 接收流利架空料箱入库任务
*
* @param mydoJob
* @return
*/
@@ -38,6 +40,7 @@ public class Wcs2WmsController {
/**
* 流利架出库确认,清空状态记录表
*
* @param mydoJob
* @return
*/
@@ -48,6 +51,7 @@ public class Wcs2WmsController {
/**
* 取消ctu任务
*
* @param mydoJob
* @return
*/

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

@@ -90,10 +90,10 @@ public interface IApiService
/**
* agv搬运作业
*
* @param genAgvSchedulingTaskRequest
* @param param
* @return
*/
AjaxResult receiveAgvMoveJob(GenAgvSchedulingTaskRequest genAgvSchedulingTaskRequest);
AjaxResult receiveAgvMoveJob(Map<String, String> param);
/**
* 任务到达拣选口

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

@@ -144,13 +144,12 @@ public class ApiServiceImpl implements IApiService {
/**
* agv搬运作业
*
* @param genAgvSchedulingTaskRequest
* @return
*/
@Override
public AjaxResult receiveAgvMoveJob(GenAgvSchedulingTaskRequest genAgvSchedulingTaskRequest) {
List<PositionCodeData> positionCodePath = genAgvSchedulingTaskRequest.getPositionCodePath();
AgvQueue agvQueue = createAgvQueue(positionCodePath.get(0).getPositionCode(), positionCodePath.get(1).getPositionCode(), "", "", "3");
public AjaxResult receiveAgvMoveJob(Map<String, String> param) {
//todo 待调试
AgvQueue agvQueue = createAgvQueue(param.get("startPoint"),param.get("endPoint"), param.get("wmsTrayCode"), param.get("taskNo"), "3");
GenAgvSchedulingTaskResponse genAgvSchedulingTaskResponse = requestAgvQueue(agvQueue);
if (genAgvSchedulingTaskResponse.getCode() == 0) {
return AjaxResult.success();
@@ -177,7 +176,7 @@ public class ApiServiceImpl implements IApiService {
*/
@Override
public AjaxResult sendOutMydoJobStatus(Map<String, Object> param) {
RequestLog requestLog = requestLogService.getRequestLog(SEND_OUT_MYDOJOB_STATUS, "发送出库任务状态", JSONUtil.toJsonStr(param));
RequestLog requestLog = requestLogService.getRequestLog(SEND_TASK_STARTED, "发送任务开始信号", JSONUtil.toJsonStr(param));
if ("1".equals(requestLog.getIsSuccessful())) {
return AjaxResult.success();
} else {
@@ -214,7 +213,7 @@ public class ApiServiceImpl implements IApiService {
log.info("【AGV任务开始】任务号：{}", taskCode);
//通知wms
param.put("taskNo", agvQueue.getWmsTaskNo());
param.put("status","2");
param.put("wmsType", agvQueue.getWmsTaskType());
sendOutMydoJobStatus(param);
break;
case "outbin":

4
ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java
View File

@@ -19,15 +19,13 @@ public class Constant {
public static final String BASEURL_AGV = BASEURL + "/rcms-dps/rest/queryAgvStatus/";
public static final String GET_MYDOJOB_URL = "http://localhost:8080/api2wms/getJob";
public static final String REQUEST_ENTER_BY_TRAYCODE = "http://localhost:8080/api2wms/requestEnterByTrayCode";
public static final String REQUEST_ENTER_BY_ENTER_ID = "http://localhost:8080/api2wms/requestEnterByEnterId";
public static final String UPDATE_MYDOJOB_URL = "http://127.0.0.1:8081/rcms-dps/rest/queryAgvStatus/";
public static final String JOB_FINISH_URL = "http://localhost:8080/api2wms/jobFinish";
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";
public static final String SEND_TASK_STARTED = "http://127.0.0.1:8080/api2wms/startSignal";
public static final String TAKE_COMPLETED = "http://127.0.0.1:8080/api2wms/takeCompleted";
}