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

123

Browse Source
This commit is contained in:
张怡蓉
2025-12-12 10:12:34 +08:00
parent 80765e5f97
commit b58f025d13
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,19 +104,20 @@ public class LineSsjThread implements Runnable {
mydoJob.setTrayCode(serial); mydoJob.setTrayCode(serial);
mydoJob.setEntranceId("G1005"); mydoJob.setEntranceId("G1005");
mydoJob.setFlag("0"); mydoJob.setFlag("0");
mydoJob.setStatus("1");
List<MydoJob> mydoJobs = mydoJobService.selectInOrOutMydoJobList(mydoJob); List<MydoJob> mydoJobs = mydoJobService.selectInOrOutMydoJobList(mydoJob);
//有作业，下发输送机任务号，覆盖任务号 //有作业，下发输送机任务号，覆盖任务号
if (!mydoJobs.isEmpty()) { if (!mydoJobs.isEmpty()) {
//永远有且只有一条 //永远有且只有一条
mydoJob = mydoJobs.get(0); mydoJob = mydoJobs.get(0);
if(mydoJob.getStatus().equals("1")) {
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_LINE_SSJ); mydoJob.setExecutionPhase(TASK_EP_LINE_SSJ);
mydoJobService.updateMydoJob(mydoJob); mydoJobService.updateMydoJob(mydoJob);
log.info("G1005产线输送机下发任务号成功:" + mydoJob.getTaskNo()); log.info("G1005产线输送机下发任务号成功:" + mydoJob.getTaskNo());
} }
}
} else { } else {
@@ -168,20 +169,20 @@ public class LineSsjThread implements Runnable {
//查wcs有没作业，有下发给输送机任务号，覆盖任务号 //查wcs有没作业，有下发给输送机任务号，覆盖任务号
MydoJob mydoJob = new MydoJob(); MydoJob mydoJob = new MydoJob();
mydoJob.setInOrOut("1"); mydoJob.setInOrOut("1");
// mydoJob.setStatus("1");
mydoJob.setEntranceId("G1005"); mydoJob.setEntranceId("G1005");
mydoJob.setFlag("1"); mydoJob.setFlag("1");
// mydoJob.setExecutionPhase("0"); mydoJob.setStatus("1");
List<MydoJob> mydoJobs = mydoJobService.selectInOrOutMydoJobList(mydoJob); List<MydoJob> mydoJobs = mydoJobService.selectInOrOutMydoJobList(mydoJob);
if (!mydoJobs.isEmpty()) { if (!mydoJobs.isEmpty()) {
mydoJob = mydoJobs.get(0); mydoJob = mydoJobs.get(0);
if(mydoJob.getStatus().equals("1") && mydoJob.getExecutionPhase().equals("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_LINE_SSJ); mydoJob.setExecutionPhase(TASK_EP_LINE_SSJ);
mydoJobService.updateMydoJob(mydoJob); mydoJobService.updateMydoJob(mydoJob);
log.info("G1005产线输送机下发任务号成功:" + mydoJob.getTaskNo()); log.info("G1005产线输送机下发任务号成功:" + mydoJob.getTaskNo());
}
} }
} else { } else {
//没有，请求错误接口，找作业，返回成功，//拿到正常作业，插到wcs作业表，下发给输送机任务号，覆盖任务号，shibai... //没有，请求错误接口，找作业，返回成功，//拿到正常作业，插到wcs作业表，下发给输送机任务号，覆盖任务号，shibai...