lhq/FT517-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 14:15:51 +08:00
parent ef3366e30b
commit 10fb300a1e
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,11 +155,30 @@ public class Floor1BothWayInSsjThread implements Runnable {
} }
} else { } else {
if (StrUtil.isNotEmpty(ssj.getTrayCode())) { if (StrUtil.isNotEmpty(ssj.getTrayCode())) {
//根据托盘码请求入库作业 MydoJob param = new MydoJob();
AjaxResult result = apiService.requestEnterByEnterIdAndTrayCode(); param.setStatus("3");
if (result.isSuccess()) { if ("L2005".equals(ssj.getDeviceCode())) {
MydoJob inJob = (MydoJob) result.get("data"); param.setEntranceId("L2013");
mydoJobService.insertMydoJob(inJob); }else {
param.setEntranceId("L2012");
}
List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(param);
MydoJob inJob = null;
if (CollUtil.isNotEmpty(mydoJobs)) {
inJob = mydoJobs.get(0);
} else {
//根据托盘码请求入库作业
AjaxResult result = apiService.requestEnterByEnterIdAndTrayCode();
if (result.isSuccess()) {
inJob = (MydoJob) result.get("data");
inJob.setStatus("3");
inJob.setStartTime(DateUtil.formatDateTime(DateUtil.date()));
mydoJobService.insertMydoJob(inJob);
} else {
log.info("未检测到托盘码请求入库作业 rwh:{},trayCode:{}", ssj.getTaskNo(), ssj.getTrayCode());
}
}
if (inJob != null){
SendData qx = new SendData(Tools.INT, 1); SendData qx = new SendData(Tools.INT, 1);
SendData rwh = new SendData(Tools.DINT, inJob.getTaskNo()); SendData rwh = new SendData(Tools.DINT, inJob.getTaskNo());
byte[] bytes = Tools.sendData(qx, rwh); byte[] bytes = Tools.sendData(qx, rwh);
@@ -168,7 +187,6 @@ public class Floor1BothWayInSsjThread implements Runnable {
switch (ssj.getDeviceCode()) { switch (ssj.getDeviceCode()) {
case "L2005": case "L2005":
i = PlcSsjRead.WriteToSSJ("DB501.20", bytes); i = PlcSsjRead.WriteToSSJ("DB501.20", bytes);
break; break;
case "L2012": case "L2012":
i = PlcSsjRead.WriteToSSJ("DB501.30", bytes); i = PlcSsjRead.WriteToSSJ("DB501.30", bytes);
@@ -177,8 +195,6 @@ public class Floor1BothWayInSsjThread implements Runnable {
if (i == 1) { if (i == 1) {
log.info("入库请求下发任务号加去向 rwh:{},qx:{},trayCode:{}", ssj.getTaskNo(), 1, ssj.getTrayCode()); log.info("入库请求下发任务号加去向 rwh:{},qx:{},trayCode:{}", ssj.getTaskNo(), 1, ssj.getTrayCode());
} }
}else {
log.info("未检测到托盘码请求入库作业 rwh:{},trayCode:{}", ssj.getTaskNo(), ssj.getTrayCode());
} }
} else { } else {
//回退 //回退