diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java index 2861667..471b34b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java @@ -155,11 +155,30 @@ public class Floor1BothWayInSsjThread implements Runnable { } } else { if (StrUtil.isNotEmpty(ssj.getTrayCode())) { - //根据托盘码请求入库作业 - AjaxResult result = apiService.requestEnterByEnterIdAndTrayCode(); - if (result.isSuccess()) { - MydoJob inJob = (MydoJob) result.get("data"); - mydoJobService.insertMydoJob(inJob); + MydoJob param = new MydoJob(); + param.setStatus("3"); + if ("L2005".equals(ssj.getDeviceCode())) { + param.setEntranceId("L2013"); + }else { + param.setEntranceId("L2012"); + } + List mydoJobs = mydoJobService.selectMydoJobList(param); + MydoJob inJob = null; + if (CollUtil.isNotEmpty(mydoJobs)) { + inJob = mydoJobs.get(0); + } else { + //根据托盘码请求入库作业 + AjaxResult result = apiService.requestEnterByEnterIdAndTrayCode(); + if (result.isSuccess()) { + inJob = (MydoJob) result.get("data"); + inJob.setStatus("3"); + inJob.setStartTime(DateUtil.formatDateTime(DateUtil.date())); + mydoJobService.insertMydoJob(inJob); + } else { + log.info("未检测到托盘码请求入库作业 rwh:{},trayCode:{}", ssj.getTaskNo(), ssj.getTrayCode()); + } + } + if (inJob != null){ SendData qx = new SendData(Tools.INT, 1); SendData rwh = new SendData(Tools.DINT, inJob.getTaskNo()); byte[] bytes = Tools.sendData(qx, rwh); @@ -168,7 +187,6 @@ public class Floor1BothWayInSsjThread implements Runnable { switch (ssj.getDeviceCode()) { case "L2005": i = PlcSsjRead.WriteToSSJ("DB501.20", bytes); - break; case "L2012": i = PlcSsjRead.WriteToSSJ("DB501.30", bytes); @@ -177,8 +195,6 @@ public class Floor1BothWayInSsjThread implements Runnable { if (i == 1) { log.info("入库请求下发任务号加去向 rwh:{},qx:{},trayCode:{}", ssj.getTaskNo(), 1, ssj.getTrayCode()); } - }else { - log.info("未检测到托盘码请求入库作业 rwh:{},trayCode:{}", ssj.getTaskNo(), ssj.getTrayCode()); } } else { //回退