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

优化0120

Browse Source
This commit is contained in:
zj
2026-01-20 16:45:46 +08:00
parent 6c2d8fcb0f
commit d2d871baf1
26 changed files with 335 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,6 @@ public class AgvController extends BaseController {
}
/**
* agv搬运作业
* @param param{

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

@@ -279,16 +279,21 @@ public class ApiServiceImpl implements IApiService {
agvQueue.setReqTime(DateUtil.formatDateTime(DateUtil.date()));
agvQueue.setAgvType("AGV");
agvQueue.setPositionCode1(code1);
agvQueue.setPositionCode2(code2);
agvQueue.setTaskType("A22");
// agvQueue.setCtnrType("1");
//rcslite开启托盘自动调整位置后 - 测试一巷道放货区分托盘类型
if (traySize == "2" || traySize == "3") {
agvQueue.setCtnrType("3");
if("4".equals(traySize) && "L1001".equals(code2)){
agvQueue.setPositionCode2("L1001-1");
}else{
agvQueue.setCtnrType("1");
agvQueue.setPositionCode2(code2);
}
agvQueue.setTaskType("A22");
agvQueue.setCtnrType("1");
//rcslite开启托盘自动调整位置后 - 测试一巷道放货区分托盘类型
// if (traySize == "2" || traySize == "3") {
// agvQueue.setCtnrType("3");
// }else{
// agvQueue.setCtnrType("1");
// }
agvQueue.setCtnrCode(traySize);
agvQueue.setCtnrNum("0");
agvQueue.setTaskMode("0");
@@ -379,9 +384,11 @@ public class ApiServiceImpl implements IApiService {
mydoJob.setTaskNo(receiveOutJob.getTaskNo());
mydoJob.setCargoSpaceId(receiveOutJob.getCargoSpaceId());
if("L2002".equals(receiveOutJob.getExitId()) || "L2008".equals(receiveOutJob.getCargoSpaceId())
|| "L2004".equals(receiveOutJob.getCargoSpaceId()) || "L2006".equals(receiveOutJob.getExitId())) {
if("L2002".equals(receiveOutJob.getExitId()) || "L2008".equals(receiveOutJob.getExitId())
|| "L2004".equals(receiveOutJob.getExitId()) || "L2006".equals(receiveOutJob.getExitId())) {
mydoJob.setExitId("1");
}else{
mydoJob.setExitId(receiveOutJob.getExitId());
}
mydoJob.setInOrOut(receiveOutJob.getInOrOut());
mydoJob.setStatus("1");
@@ -414,7 +421,7 @@ public class ApiServiceImpl implements IApiService {
return AjaxResult.error();
}
}
//todo 新增agv站点
@Override
public AjaxResult deleteAgvTray(AgvQueue agvQueue) {
Map<String, String> paramMap = new HashMap<>();
@@ -428,6 +435,9 @@ public class ApiServiceImpl implements IApiService {
if("L1003".equals(agvQueue.getPositionCode2())){
paramMap.put("stgBinCode", "JT000206001013");
}
if("L1001-1".equals(agvQueue.getPositionCode2())){
paramMap.put("stgBinCode", "JT000407001013");
}
// paramMap.put("binName", agvQueue.getPositionCode2());
paramMap.put("indBind", "0");