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-22 17:12:50 +08:00
parent baed4a312e
commit 006bba47da
19 changed files with 245 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/Ddj1Thread.java
View File

@@ -14,8 +14,8 @@ import com.ruoyi.job.service.IMydoJobService;
import com.ruoyi.queue.ddj.domain.DdjDeviceExecutionQueue;
import com.ruoyi.queue.ddj.service.IDdjDeviceExecutionQueueFinishService;
import com.ruoyi.queue.ddj.service.IDdjDeviceExecutionQueueService;
import com.ruoyi.schedule.plcRead.ddj.IsoTcpClientDDJ1;
import com.ruoyi.schedule.plcRead.ssj.PlcRead;
import com.ruoyi.schedule.plcRead.ddj.PlcDdjRead;
import com.ruoyi.schedule.plcRead.ssj.PlcSsjRead;
import com.ruoyi.schedule.plcRead.util.Tools;
import lombok.extern.slf4j.Slf4j;
@@ -48,7 +48,8 @@ public class Ddj1Thread implements Runnable {
apiService = SpringUtils.getBean(IApiService.class);
ddjDeviceExecutionQueueService = SpringUtils.getBean(IDdjDeviceExecutionQueueService.class);
ddjDeviceExecutionQueueFinishService = SpringUtils.getBean(IDdjDeviceExecutionQueueFinishService.class);
log.info("初始化服务 {}，{},{}", apiService, ddjDeviceExecutionQueueService, ddjDeviceExecutionQueueFinishService);
mydoJobService = SpringUtils.getBean(IMydoJobService.class);
log.info("初始化服务 {}，{},{},{}", apiService, ddjDeviceExecutionQueueService, ddjDeviceExecutionQueueFinishService,mydoJobService);
}
@Override
@@ -60,8 +61,8 @@ public class Ddj1Thread implements Runnable {
if ("ddj".equals(type)) {
for (String ddjCode : ddjCodeList.get(type)) {
try {
if (PlcRead.deviceDdjMap.containsKey(ddjCode)) {
ddjTask(PlcRead.deviceDdjMap.get(ddjCode));
if (PlcDdjRead.deviceDdjMap.containsKey(ddjCode)) {
ddjTask(PlcDdjRead.deviceDdjMap.get(ddjCode));
} else {
log.error("设备不存在 ssjCode{}", ddjCode);
}
@@ -213,7 +214,7 @@ public class Ddj1Thread implements Runnable {
* @param rwh 作业单号
* @param id 作业单id
*/
private void InvalidMydoJob(Long rwh, Long id) {
private void InvalidMydoJob(Long rwh, Integer id) {
mydoJobService.InvalidMydoJob(rwh, id);
}
@@ -223,7 +224,7 @@ public class Ddj1Thread implements Runnable {
* @param rwh 作业单号
* @param id 作业单id
*/
private void ddjTaskFinish(Long rwh, Long id) {
private void ddjTaskFinish(Long rwh, Integer id) {
mydoJobService.ddjTaskFinish(rwh, id);
}
@@ -233,7 +234,7 @@ public class Ddj1Thread implements Runnable {
*
* @param queue 堆垛机执行的队列
*/
private int issuedDDJTask(Long devId, DdjDeviceExecutionQueue queue) {
private int issuedDDJTask(Integer devId, DdjDeviceExecutionQueue queue) {
int taskNo = Convert.toInt(queue.getRwh());
int yph = Convert.toInt(queue.getYph());
int ylh = Convert.toInt(queue.getYlh());
@@ -246,9 +247,9 @@ public class Ddj1Thread implements Runnable {
int jym = Tools.getJYM(taskNo, yph, ylh, ych, mbph, mblh, mbch, mlfs, xfwc);
byte[] sendData = Tools.sendDataToDevice(taskNo, null, yph, ylh, ych, mbph, mblh, mbch, mlfs, xfwc, jym);
if (devId==1){
return IsoTcpClientDDJ1.WritetoDDJ("DB61.0", sendData);
return PlcDdjRead.WritetoDDJ("DB61.0", sendData);
}else {
return IsoTcpClientDDJ1.WritetoDDJ("DB61.0", sendData);
return PlcDdjRead.WritetoDDJ("DB61.0", sendData);
}
}

6
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/Ddj2Thread.java
View File

@@ -10,7 +10,7 @@ import com.ruoyi.job.domain.MydoJob;
import com.ruoyi.queue.agv.domain.AgvQueue;
import com.ruoyi.queue.agv.service.IAgvQueueService;
import com.ruoyi.device.ssj.domain.DeviceSsj;
import com.ruoyi.schedule.plcRead.ssj.PlcRead;
import com.ruoyi.schedule.plcRead.ssj.PlcSsjRead;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
@@ -58,8 +58,8 @@ public class Ddj2Thread implements Runnable {
//正常入库 尾箱回流 物料入库 空料箱入库
for (String ssjCode : ssjCodeList.get(type)) {
try {
if (PlcRead.deviceSsjMap.containsKey(ssjCode)) {
inDispatch(PlcRead.deviceSsjMap.get(ssjCode));
if (PlcSsjRead.deviceSsjMap.containsKey(ssjCode)) {
inDispatch(PlcSsjRead.deviceSsjMap.get(ssjCode));
} else {
log.error("设备不存在 ssjCode{}", ssjCode);
}

6
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1SsjInOutThread.java
View File

@@ -10,7 +10,7 @@ import com.ruoyi.job.domain.MydoJob;
import com.ruoyi.queue.agv.domain.AgvQueue;
import com.ruoyi.queue.agv.service.IAgvQueueService;
import com.ruoyi.device.ssj.domain.DeviceSsj;
import com.ruoyi.schedule.plcRead.ssj.PlcRead;
import com.ruoyi.schedule.plcRead.ssj.PlcSsjRead;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
@@ -58,8 +58,8 @@ public class Floor1SsjInOutThread implements Runnable {
//正常入库 尾箱回流 物料入库 空料箱入库
for (String ssjCode : ssjCodeList.get(type)) {
try {
if (PlcRead.deviceSsjMap.containsKey(ssjCode)) {
inDispatch(PlcRead.deviceSsjMap.get(ssjCode));
if (PlcSsjRead.deviceSsjMap.containsKey(ssjCode)) {
inDispatch(PlcSsjRead.deviceSsjMap.get(ssjCode));
} else {
log.error("设备不存在 ssjCode{}", ssjCode);
}

10
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1SsjRoadWayThread.java
View File

@@ -4,7 +4,7 @@ import com.ruoyi.api.service.IApiService;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.queue.agv.service.IAgvQueueService;
import com.ruoyi.device.ssj.domain.DeviceSsj;
import com.ruoyi.schedule.plcRead.ssj.PlcRead;
import com.ruoyi.schedule.plcRead.ssj.PlcSsjRead;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
@@ -51,8 +51,8 @@ public class Floor1SsjRoadWayThread implements Runnable {
//退料入库 其它入库
for (String ssjCode : ssjCodeList.get(type)) {
try {
if (PlcRead.deviceSsjMap.containsKey(ssjCode)) {
inDispatch(PlcRead.deviceSsjMap.get(ssjCode));
if (PlcSsjRead.deviceSsjMap.containsKey(ssjCode)) {
inDispatch(PlcSsjRead.deviceSsjMap.get(ssjCode));
} else {
log.error("设备不存在 ssjCode{}", ssjCode);
}
@@ -65,8 +65,8 @@ public class Floor1SsjRoadWayThread implements Runnable {
case "out":
for (String ssjCode : ssjCodeList.get(type)) {
try {
if (PlcRead.deviceSsjMap.containsKey(ssjCode)) {
outDispatch(PlcRead.deviceSsjMap.get(ssjCode));
if (PlcSsjRead.deviceSsjMap.containsKey(ssjCode)) {
outDispatch(PlcSsjRead.deviceSsjMap.get(ssjCode));
} else {
log.error("设备不存在 ssjCode{}", ssjCode);
}

6
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2SsjInOutThread.java
View File

@@ -10,7 +10,7 @@ import com.ruoyi.job.domain.MydoJob;
import com.ruoyi.queue.agv.domain.AgvQueue;
import com.ruoyi.queue.agv.service.IAgvQueueService;
import com.ruoyi.device.ssj.domain.DeviceSsj;
import com.ruoyi.schedule.plcRead.ssj.PlcRead;
import com.ruoyi.schedule.plcRead.ssj.PlcSsjRead;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
@@ -58,8 +58,8 @@ public class Floor2SsjInOutThread implements Runnable {
//正常入库 尾箱回流 物料入库 空料箱入库
for (String ssjCode : ssjCodeList.get(type)) {
try {
if (PlcRead.deviceSsjMap.containsKey(ssjCode)) {
inDispatch(PlcRead.deviceSsjMap.get(ssjCode));
if (PlcSsjRead.deviceSsjMap.containsKey(ssjCode)) {
inDispatch(PlcSsjRead.deviceSsjMap.get(ssjCode));
} else {
log.error("设备不存在 ssjCode{}", ssjCode);
}

6
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2SsjRoadWayThread.java
View File

@@ -4,7 +4,7 @@ import com.ruoyi.api.service.IApiService;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.queue.agv.service.IAgvQueueService;
import com.ruoyi.device.ssj.domain.DeviceSsj;
import com.ruoyi.schedule.plcRead.ssj.PlcRead;
import com.ruoyi.schedule.plcRead.ssj.PlcSsjRead;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
@@ -45,8 +45,8 @@ public class Floor2SsjRoadWayThread implements Runnable {
//生产线入库
for (String ssjCode : ssjCodeList.get(type)) {
try {
if (PlcRead.deviceSsjMap.containsKey(ssjCode)) {
inDispatch(PlcRead.deviceSsjMap.get(ssjCode));
if (PlcSsjRead.deviceSsjMap.containsKey(ssjCode)) {
inDispatch(PlcSsjRead.deviceSsjMap.get(ssjCode));
} else {
log.error("设备不存在 ssjCode{}", ssjCode);
}