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

出入库限制优化

Browse Source
This commit is contained in:
lsymicc
2026-06-11 10:52:10 +08:00
parent 08ceae0454
commit c9db39571c
4 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -545,9 +545,9 @@ public class ApiServiceImpl implements IApiService {
// 3.是否已经有正在执行的入库任务
job = new MydoJob().builder().inOrOut(STOCKIN).build();
tasks = mydoJobService.selectMydoJobList(job);
if (tasks.size() != 0) {
log.info("【警告】wms下发出库任务失败，已经存在正在执行的入库任务，请稍后重试");
return AjaxResult.error("【警告】wms下发出库任务失败，已经存在正在执行的入库任务，请稍后重试");
if (tasks.size() > 0) {
log.info("【警告】wms下发出库任务失败，已经有正在执行的入库任务，请稍后重试");
return AjaxResult.error("【警告】wms下发出库任务失败，已经有正在执行的入库任务，请稍后重试");
}
//生成出库作业

5
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java
View File

@@ -293,6 +293,7 @@ public class DdjThread implements Runnable {
//正常下发
if (ddj.getYxxf() == 1 && ddj.getSbzt() == 0 ) {
//检查是否有正在执行的堆垛机队列
Long rwh = ddj.getRwh();
DdjDeviceExecutionQueue ddjDeviceExecutionQueueRunningParam = new DdjDeviceExecutionQueue();
@@ -320,9 +321,9 @@ public class DdjThread implements Runnable {
ddjDeviceExecutionQueue.setXfsj(DateUtil.formatDateTime(DateUtil.date()));
ddjDeviceExecutionQueue.setDdjxf("1");
ddjDeviceExecutionQueueService.updateDdjDeviceExecutionQueue(ddjDeviceExecutionQueue);
log.info("【堆垛机入库】下发任务成功，任务执行中, 任务号:{}", ddjDeviceExecutionQueue.getRwh());
log.info("【堆垛机执行】下发任务成功，任务执行中, 任务号:{}", ddjDeviceExecutionQueue.getRwh());
} else {
log.error("【堆垛机入库】执行异常, 堆垛机下发任务失败！");
log.error("【堆垛机执行】执行异常, 堆垛机下发任务失败！");
}
}
}

9
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/PortConvThread.java
View File

@@ -124,11 +124,14 @@ public class PortConvThread implements Runnable {
//输送机状态
if (!convChecked(inSsjDevice)) return;
//更新入库任务阶段
updateMydoJob(inSsjDevice);
//请求wms获取入库任务
requestMydoJob(inSsjDevice);
//更新入库任务阶段
updateMydoJob(inSsjDevice);
}
@@ -171,7 +174,7 @@ public class PortConvThread implements Runnable {
return;
}
int stockoutMydoJob = mydoJobService.selectInOrOutMydoJobList(
int stockoutMydoJob = mydoJobService.selectMydoJobList(
new MydoJob().builder().inOrOut(STOCKOUT).build()
).size();