diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java index 0f39072b..6bc2875e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java @@ -104,19 +104,20 @@ public class LineSsjThread implements Runnable { mydoJob.setTrayCode(serial); mydoJob.setEntranceId("G1005"); mydoJob.setFlag("0"); + mydoJob.setStatus("1"); List mydoJobs = mydoJobService.selectInOrOutMydoJobList(mydoJob); //有作业,下发输送机任务号,覆盖任务号 if (!mydoJobs.isEmpty()) { //永远有且只有一条 mydoJob = mydoJobs.get(0); - if(mydoJob.getStatus().equals("1")) { + int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), mydoJob.getTaskNo(), 1, 1); if (i == 1) { mydoJob.setExecutionPhase(TASK_EP_LINE_SSJ); mydoJobService.updateMydoJob(mydoJob); log.info("G1005产线输送机下发任务号成功:" + mydoJob.getTaskNo()); } - } + } else { @@ -168,20 +169,20 @@ public class LineSsjThread implements Runnable { //查wcs有没作业,有下发给输送机任务号,覆盖任务号 MydoJob mydoJob = new MydoJob(); mydoJob.setInOrOut("1"); -// mydoJob.setStatus("1"); mydoJob.setEntranceId("G1005"); mydoJob.setFlag("1"); -// mydoJob.setExecutionPhase("0"); + mydoJob.setStatus("1"); + List mydoJobs = mydoJobService.selectInOrOutMydoJobList(mydoJob); if (!mydoJobs.isEmpty()) { mydoJob = mydoJobs.get(0); - if(mydoJob.getStatus().equals("1") && mydoJob.getExecutionPhase().equals("0")) { + int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), mydoJob.getTaskNo(), 1, 1); if (i == 1) { mydoJob.setExecutionPhase(TASK_EP_LINE_SSJ); mydoJobService.updateMydoJob(mydoJob); log.info("G1005产线输送机下发任务号成功:" + mydoJob.getTaskNo()); - } + } } else { //没有,请求错误接口,找作业,返回成功,//拿到正常作业,插到wcs作业表,下发给输送机任务号,覆盖任务号,shibai...