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

一楼入库调度逻辑

Browse Source
This commit is contained in:
liuhanqing
2025-09-24 11:28:09 +08:00
parent b5656f096e
commit ef3366e30b
3 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,4 +158,6 @@ public interface IApiService
* 入库请求生成作业
*/
public AjaxResult createInMydoJob(Map<String, Object> param);
public AjaxResult requestEnterByEnterIdAndTrayCode();
}

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

@@ -395,4 +395,9 @@ public class ApiServiceImpl implements IApiService {
return AjaxResult.error();
}
}
@Override
public AjaxResult requestEnterByEnterIdAndTrayCode() {
return null;
}
}

39
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java
View File

@@ -10,6 +10,7 @@ import com.ruoyi.api.domain.agv.genAgvSchedulingTask.GenAgvSchedulingTaskRespons
import com.ruoyi.api.service.IApiService;
import com.ruoyi.bas.cargospace.domain.BasCargoSpace;
import com.ruoyi.bas.cargospace.service.IBasCargoSpaceService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.domain.SendData;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.job.domain.MydoJob;
@@ -154,22 +155,30 @@ public class Floor1BothWayInSsjThread implements Runnable {
}
} else {
if (StrUtil.isNotEmpty(ssj.getTrayCode())) {
SendData qx = new SendData(Tools.INT, 1);
SendData rwh = new SendData(Tools.DINT, ssj.getTaskNo());
byte[] bytes = Tools.sendData(qx, rwh);
int i = 0;
//下发去向 和任务号
switch (ssj.getDeviceCode()) {
case "L2005":
i = PlcSsjRead.WriteToSSJ("DB501.20", bytes);
//根据托盘码请求入库作业
AjaxResult result = apiService.requestEnterByEnterIdAndTrayCode();
if (result.isSuccess()) {
MydoJob inJob = (MydoJob) result.get("data");
mydoJobService.insertMydoJob(inJob);
SendData qx = new SendData(Tools.INT, 1);
SendData rwh = new SendData(Tools.DINT, inJob.getTaskNo());
byte[] bytes = Tools.sendData(qx, rwh);
int i = 0;
//下发去向 和任务号
switch (ssj.getDeviceCode()) {
case "L2005":
i = PlcSsjRead.WriteToSSJ("DB501.20", bytes);
break;
case "L2012":
i = PlcSsjRead.WriteToSSJ("DB501.30", bytes);
break;
}
if (i == 1) {
log.info("入库请求下发任务号加去向 rwh:{},qx:{},trayCode:{}", ssj.getTaskNo(), 1, ssj.getTrayCode());
break;
case "L2012":
i = PlcSsjRead.WriteToSSJ("DB501.30", bytes);
break;
}
if (i == 1) {
log.info("入库请求下发任务号加去向 rwh:{},qx:{},trayCode:{}", ssj.getTaskNo(), 1, ssj.getTrayCode());
}
}else {
log.info("未检测到托盘码请求入库作业 rwh:{},trayCode:{}", ssj.getTaskNo(), ssj.getTrayCode());
}
} else {
//回退