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

小车

Browse Source
This commit is contained in:
张怡蓉
2025-12-09 09:51:00 +08:00
parent 9b4bbec353
commit 649d68112e
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/srgv/BaseSRgvThread.java
View File

@@ -295,28 +295,34 @@ public class BaseSRgvThread implements Runnable, SRgvThreadInterface {
} else { } else {
//别的层的出库作业和入库作业 //别的层的出库作业和入库作业
ArrayList<MydoJob> mydoJobs2 = new ArrayList<>(); MydoJob job=null;
MydoJob mydoJob2 = new MydoJob();
mydoJob2.setInOut("2");
mydoJob2.setStatus("1");
List<MydoJob> mydoJobs3 = mydoJobService.selectMydoJobList(mydoJob2);
MydoJob mydoJob3 = new MydoJob(); MydoJob mydoJob3 = new MydoJob();
mydoJob3.setStatus("3"); mydoJob3.setStatus("3");
mydoJob3.setInOut("1"); mydoJob3.setInOut("1");
//todo 输送机阶段 //todo 输送机阶段
mydoJob3.setExecutionPhase("1"); mydoJob3.setExecutionPhase("1");
List<MydoJob> mydoJobs4 = mydoJobService.selectMydoJobList(mydoJob3); List<MydoJob> mydoJobs4 = mydoJobService.selectMydoJobList(mydoJob3);
mydoJobs2.addAll(mydoJobs3); if(!mydoJobs4.isEmpty()){
mydoJobs2.addAll(mydoJobs4); job=mydoJobs4.get(0);
}else{
MydoJob mydoJob2 = new MydoJob();
mydoJob2.setInOut("2");
mydoJob2.setStatus("1");
List<MydoJob> mydoJobs3 = mydoJobService.selectMydoJobList(mydoJob2);
if(!mydoJobs3.isEmpty()){
job=mydoJobs3.get(0);
}
}
if(job!=null) {
//判断那层没有小车，并且没有要去那层的小车队列,查监控表 //判断那层没有小车，并且没有要去那层的小车队列,查监控表
//生成换层任务 //生成换层任务
MydoJob job = mydoJobs2.get(0);
DeviceSrgv deviceSrgv1 = new DeviceSrgv();
DeviceSrgv deviceSrgv1 = new DeviceSrgv();
deviceSrgv1.setCurrFloor(Convert.toInt(job.getTheFloor())); deviceSrgv1.setCurrFloor(Convert.toInt(job.getTheFloor()));
List<DeviceSrgv> srgvs = deviceSrgvService.selectDeviceSrgvList(deviceSrgv1); List<DeviceSrgv> srgvs = deviceSrgvService.selectDeviceSrgvList(deviceSrgv1);
//这个作业的目标层没有小车 //这个作业的目标层没有小车
if (srgvs.isEmpty()) { if (srgvs.isEmpty()) {
WcsSrgvQueue wcsSrgvQueue1 = new WcsSrgvQueue(); WcsSrgvQueue wcsSrgvQueue1 = new WcsSrgvQueue();
@@ -325,12 +331,12 @@ public class BaseSRgvThread implements Runnable, SRgvThreadInterface {
List<WcsSrgvQueue> wcsSrgvQueues = wcsSagvQueueMapper.selectWcsSrgvQueueList(wcsSrgvQueue1); List<WcsSrgvQueue> wcsSrgvQueues = wcsSagvQueueMapper.selectWcsSrgvQueueList(wcsSrgvQueue1);
if (wcsSrgvQueues.isEmpty()) { if (wcsSrgvQueues.isEmpty()) {
//生成换层任务 //生成换层任务
createCarQueue(mydoJob2, deviceSrgv, "8","0"); createCarQueue(job, deviceSrgv, "8", "0");
} }
} }
}
} }

2
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/SsjThread.java
View File

@@ -125,7 +125,7 @@ public class SsjThread implements Runnable {
void inDispatch1(DeviceSsj deviceSsj) { void inDispatch1(DeviceSsj deviceSsj) {
if (deviceSsj.getDw() == 1 && StrUtil.isNotBlank(deviceSsj.getTrayCode())) { if (deviceSsj.getDw() == 1 && StrUtil.isNotBlank(deviceSsj.getTrayCode())) {
//todo 查是否为入库模式，不是退回 //todo 查是否有正执行的出库作业，有退回
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("trayCode", deviceSsj.getTrayCode()); map.put("trayCode", deviceSsj.getTrayCode());
//拉取 //拉取