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

提升机生成放货 取货SRgv队列

Browse Source
This commit is contained in:
liuhanqing
2025-11-27 08:59:09 +08:00
parent b1496199d6
commit 7b48d380ef
1 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/tsj/TsjThread.java
View File

@@ -7,7 +7,6 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.ruoyi.bas.cargospace.domain.BasCargoSpace;
import com.ruoyi.bas.cargospace.service.IBasCargoSpaceService; import com.ruoyi.bas.cargospace.service.IBasCargoSpaceService;
import com.ruoyi.bas.port.domain.WcsPort; import com.ruoyi.bas.port.domain.WcsPort;
import com.ruoyi.bas.port.service.IWcsPortService; import com.ruoyi.bas.port.service.IWcsPortService;
@@ -15,7 +14,6 @@ import com.ruoyi.common.domain.SendData;
import com.ruoyi.device.srgv.domain.DeviceSrgv; import com.ruoyi.device.srgv.domain.DeviceSrgv;
import com.ruoyi.device.tsj.domain.DeviceTsj; import com.ruoyi.device.tsj.domain.DeviceTsj;
import com.ruoyi.device.tsj.service.IDeviceTsjService; import com.ruoyi.device.tsj.service.IDeviceTsjService;
import com.ruoyi.job.domain.MydoJob;
import com.ruoyi.job.service.IMydoJobService; import com.ruoyi.job.service.IMydoJobService;
import com.ruoyi.queue.srgv.domain.WcsSrgvQueue; import com.ruoyi.queue.srgv.domain.WcsSrgvQueue;
import com.ruoyi.queue.srgv.service.IWcsSrgvQueueService; import com.ruoyi.queue.srgv.service.IWcsSrgvQueueService;
@@ -30,8 +28,6 @@ import lombok.extern.slf4j.Slf4j;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
@Slf4j @Slf4j
public class TsjThread implements Runnable { public class TsjThread implements Runnable {
@@ -132,21 +128,38 @@ public class TsjThread implements Runnable {
wcsSrgvQueue.setExecutionStatus("0"); wcsSrgvQueue.setExecutionStatus("0");
String startSite = ""; String startSite = "";
String endSite = ""; String endSite = "";
switch (wcsSrgvQueue.getTaskType()){ switch (wcsSrgvQueue.getDefault02()) {
case "1": case "1":
//空车 //入库
startSite = "tsj"; //满车
endSite = wcsSrgvQueue.getCargoPickSite();
break;
case "2":
case "3":
//满车或者是充电
startSite = "tsj"; startSite = "tsj";
endSite = wcsSrgvQueue.getCargoPlaceSite(); endSite = wcsSrgvQueue.getCargoPlaceSite();
break; break;
default: case "2":
log.info("任务类型错误"); //出库
startSite = "tsj";
endSite = wcsSrgvQueue.getCargoPlaceSite();
break;
case "3":
//充电
break;
case "4":
//点到点
switch (wcsSrgvQueue.getTaskType()) {
case "1":
startSite = "tsj";
endSite = wcsSrgvQueue.getCargoPickSite();
break;
case "2":
startSite = "tsj";
endSite = wcsSrgvQueue.getCargoPlaceSite();
break;
default:
log.info("任务类型错误");
}
break;
} }
if (StrUtil.isNotEmpty(startSite) && StrUtil.isNotEmpty(endSite)){ if (StrUtil.isNotEmpty(startSite) && StrUtil.isNotEmpty(endSite)){
wcsSrgvQueue.setStartSite(startSite); wcsSrgvQueue.setStartSite(startSite);
wcsSrgvQueue.setEndSite(endSite); wcsSrgvQueue.setEndSite(endSite);
@@ -173,21 +186,26 @@ public class TsjThread implements Runnable {
WcsSrgvQueue wcsSrgvQueue = wcsSrgvQueues.get(0); WcsSrgvQueue wcsSrgvQueue = wcsSrgvQueues.get(0);
String strFloor = wcsSrgvQueue.getTheFloor(); String strFloor = wcsSrgvQueue.getTheFloor();
String tarFloor = wcsSrgvQueue.getDefault07(); String tarFloor = wcsSrgvQueue.getDefault07();
TsjDeviceExecutionQueue tsjDeviceExecutionQueue = new TsjDeviceExecutionQueue(); if (!Convert.toStr(tsj.getDqcs()).equals(strFloor)) {
tsjDeviceExecutionQueue.setGuid(IdUtil.simpleUUID()); //提升机层数和取车任务层数不一致
tsjDeviceExecutionQueue.setDeviceId(tsj.getId()); //todo 判断目标楼层存在不存在其他小车
tsjDeviceExecutionQueue.setDeviceName(tsj.getName()); TsjDeviceExecutionQueue tsjDeviceExecutionQueue = new TsjDeviceExecutionQueue();
tsjDeviceExecutionQueue.setTaskNo(Convert.toLong(deviceSrgv.getTaskNo())); tsjDeviceExecutionQueue.setGuid(IdUtil.simpleUUID());
tsjDeviceExecutionQueue.setSrcRow("0"); tsjDeviceExecutionQueue.setDeviceId(tsj.getId());
tsjDeviceExecutionQueue.setSrcLayer(strFloor); tsjDeviceExecutionQueue.setDeviceName(tsj.getName());
tsjDeviceExecutionQueue.setTarRow("0"); tsjDeviceExecutionQueue.setTaskNo(Convert.toLong(deviceSrgv.getTaskNo()));
tsjDeviceExecutionQueue.setTarLayer(tarFloor); tsjDeviceExecutionQueue.setSrcRow("0");
tsjDeviceExecutionQueue.setSendType("1"); tsjDeviceExecutionQueue.setSrcLayer(strFloor);
tsjDeviceExecutionQueue.setCreateDate(DateUtil.formatDateTime(new Date())); tsjDeviceExecutionQueue.setTarRow("0");
tsjDeviceExecutionQueue.setSpare1(Convert.toStr(deviceSrgv.getDeviceId())); tsjDeviceExecutionQueue.setTarLayer(tarFloor);
tsjDeviceExecutionQueue.setTaskType("1"); tsjDeviceExecutionQueue.setSendType("1");
tsjDeviceExecutionQueue.setRwlx("1"); tsjDeviceExecutionQueue.setCreateDate(DateUtil.formatDateTime(new Date()));
tsjDeviceExecutionQueueService.insertTsjDeviceExecutionQueue(tsjDeviceExecutionQueue); tsjDeviceExecutionQueue.setSpare1(Convert.toStr(deviceSrgv.getDeviceId()));
tsjDeviceExecutionQueue.setTaskType("1");
tsjDeviceExecutionQueue.setRwlx("1");
tsjDeviceExecutionQueueService.insertTsjDeviceExecutionQueue(tsjDeviceExecutionQueue);
}
} }
} }
} }