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

产线输送机

Browse Source
This commit is contained in:
张怡蓉
2025-12-10 09:14:56 +08:00
parent f12bcab368
commit 2fa7a06e76
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,6 @@ public class Floor2InOutSsjThread implements Runnable {
agvQueueService.updateAgvQueue(agvQueues.get(0)); agvQueueService.updateAgvQueue(agvQueues.get(0));
} }
} }
} }
//入库下发输送线 //入库下发输送线
if (inSsjDevice.getKx() == 0 && inSsjDevice.getTaskNo() == 0) { if (inSsjDevice.getKx() == 0 && inSsjDevice.getTaskNo() == 0) {
@@ -129,7 +128,6 @@ public class Floor2InOutSsjThread implements Runnable {
agvQueueService.deleteAgvQueueByReqCode(agvQueues.get(0).getReqCode()); agvQueueService.deleteAgvQueueByReqCode(agvQueues.get(0).getReqCode());
} }
} }
} }
//出库到位 //出库到位
if (inSsjDevice.getDw() == 1 && inSsjDevice.getTaskNo() > 0) { if (inSsjDevice.getDw() == 1 && inSsjDevice.getTaskNo() > 0) {

7
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java
View File

@@ -103,7 +103,7 @@ public class LineSsjThread implements Runnable {
mydoJob = mydoJobs.get(0); mydoJob = mydoJobs.get(0);
int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(),mydoJob.getTaskNo(),1,1); int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(),mydoJob.getTaskNo(),1,1);
if (i == 1) { if (i == 1) {
//mydoJob.setExecutionPhase(TASK_EP_AGV); mydoJob.setExecutionPhase(TASK_EP_AGV);
mydoJobService.updateMydoJob(mydoJob); mydoJobService.updateMydoJob(mydoJob);
log.info("G1005产线输送机下发任务号成功:" + mydoJob.getTaskNo()); log.info("G1005产线输送机下发任务号成功:" + mydoJob.getTaskNo());
} }
@@ -128,7 +128,7 @@ public class LineSsjThread implements Runnable {
mydoJobService.insertMydoJob(mydoJob2); mydoJobService.insertMydoJob(mydoJob2);
int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(),mydoJob2.getTaskNo(),1,1); int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(),mydoJob2.getTaskNo(),1,1);
if (i == 1) { if (i == 1) {
//mydoJob2.setExecutionPhase("1"); mydoJob2.setExecutionPhase(TASK_EP_AGV);
mydoJobService.updateMydoJob(mydoJob2); mydoJobService.updateMydoJob(mydoJob2);
log.info("G1005产线输送机下发任务号成功:{}" , mydoJob2.getTaskNo()); log.info("G1005产线输送机下发任务号成功:{}" , mydoJob2.getTaskNo());
} }
@@ -161,6 +161,7 @@ public class LineSsjThread implements Runnable {
mydoJob = mydoJobs.get(0); mydoJob = mydoJobs.get(0);
int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(),mydoJob.getTaskNo(),1,1); int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(),mydoJob.getTaskNo(),1,1);
if (i == 1) { if (i == 1) {
mydoJob.setExecutionPhase(TASK_EP_AGV);
mydoJobService.updateMydoJob(mydoJob); mydoJobService.updateMydoJob(mydoJob);
log.info("G1005产线输送机下发任务号成功:" + mydoJob.getTaskNo()); log.info("G1005产线输送机下发任务号成功:" + mydoJob.getTaskNo());
} }
@@ -174,7 +175,7 @@ public class LineSsjThread implements Runnable {
mydoJobService.insertMydoJob(mydoJob2); mydoJobService.insertMydoJob(mydoJob2);
int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(),mydoJob2.getTaskNo(),1,1); int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(),mydoJob2.getTaskNo(),1,1);
if (i == 1) { if (i == 1) {
mydoJob2.setExecutionPhase("1"); mydoJob2.setExecutionPhase(TASK_EP_AGV);
mydoJobService.updateMydoJob(mydoJob2); mydoJobService.updateMydoJob(mydoJob2);
log.info("G1005产线输送机下发任务号成功:" + mydoJob2.getTaskNo()); log.info("G1005产线输送机下发任务号成功:" + mydoJob2.getTaskNo());
} }