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

123

Browse Source
This commit is contained in:
张怡蓉
2025-12-11 14:20:02 +08:00
parent 2fa7a06e76
commit 337ffd8ef4
7 changed files with 217 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,12 +3,10 @@ package com.ruoyi.api.controller;
import com.ruoyi.api.domain.wcs2wms.JobParam;
import com.ruoyi.api.domain.wcs2wms.ReceiveJob;
import com.ruoyi.api.service.IApiService;
import com.ruoyi.bas.port.service.IWcsPortService;
import com.ruoyi.common.core.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/wcs2Wms/api")
@@ -16,6 +14,8 @@ public class Wcs2WmsController {
@Autowired
private IApiService apiService;
@Autowired
private IWcsPortService wcsPortService;
/**
* 接收出库任务
@@ -52,5 +52,15 @@ public class Wcs2WmsController {
}
/**
* 查询缓存点
* @param jobParam
* @return
*/
@PostMapping("/selectWcsPort")
@ResponseBody
public AjaxResult selectWcsPort(@RequestBody JobParam jobParam) {
return apiService.selectWcsPort(jobParam);
}
}

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

@@ -100,6 +100,8 @@ public interface IApiService
*/
AjaxResult cancelMydoJob(JobParam jobParam);
AjaxResult selectWcsPort(JobParam jobParam);
/**

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

@@ -18,6 +18,8 @@ import com.ruoyi.api.domain.agv.genAgvSchedulingTask.PositionCodeData;
import com.ruoyi.api.domain.wcs2wms.JobParam;
import com.ruoyi.api.domain.wcs2wms.ReceiveJob;
import com.ruoyi.api.service.IApiService;
import com.ruoyi.bas.port.domain.WcsPort;
import com.ruoyi.bas.port.service.IWcsPortService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.job.domain.MydoJob;
@@ -51,6 +53,8 @@ public class ApiServiceImpl implements IApiService {
private IAgvQueueService agvQueueService;
@Autowired
private IMydoJobService mydoJobService;
@Autowired
private IWcsPortService wcsPortService;
@@ -169,9 +173,23 @@ public class ApiServiceImpl implements IApiService {
log.info("【AGV请求放货】任务号：{}", request.getTaskCode());
break;
case "end":
agvQueue.setStatus("7");
agvQueueService.updateAgvQueue(agvQueue);
log.info("【AGV任务结束】任务号：{}", request.getTaskCode());
List<WcsPort> wcsPorts = wcsPortService.selectWcsPortList(new WcsPort());
// 查询agvQueue中的positionCode2的值是否在wcsPorts列表中存在
boolean isPositionValid = wcsPorts.stream()
.anyMatch(port -> port.getPortCode().equals(agvQueue.getPositionCode2()));
if (isPositionValid) {
agvQueueService.insertHistory(agvQueue.getReqCode());
agvQueueService.deleteAgvQueueByReqCode(agvQueue.getReqCode());
WcsPort wcsPort = new WcsPort();
wcsPort.setPortCode(agvQueue.getPositionCode2());
wcsPort.setStatus("2");
wcsPortService.updateWcsPort(wcsPort);
}
break;
default:
log.info("未知方法");
@@ -311,7 +329,7 @@ public class ApiServiceImpl implements IApiService {
*/
@Override
public GenAgvSchedulingTaskResponse requestAgvQueue(AgvQueue agvQueue) {
//todo 请求ctu
GenAgvSchedulingTaskRequest genAgvSchedulingTaskRequest = new GenAgvSchedulingTaskRequest();
genAgvSchedulingTaskRequest.setReqCode(agvQueue.getReqCode());
genAgvSchedulingTaskRequest.setTaskMode("0");
@@ -391,4 +409,10 @@ public class ApiServiceImpl implements IApiService {
return AjaxResult.error();
}
}
@Override
public AjaxResult selectWcsPort(JobParam jobParam) {
List<WcsPort> wcsPorts = wcsPortService.selectWcsPortList(new WcsPort());
return AjaxResult.success(wcsPorts);
}
}