diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java index 578dca1..d8f032f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java @@ -70,20 +70,25 @@ public class ApiServiceImpl implements IApiService { public List getMydoJobList(MydoJob mydoJob) { RequestLog requestLog = requestLogService.getRequestLog(GET_MYDOJOB_URL, "获取任务", JSONUtil.toJsonStr(mydoJob)); String responseBody = requestLog.getResponseBody(); - InterfaceReceive bean = JSONUtil.toBean(responseBody, InterfaceReceive.class); - return JSONUtil.toList(JSONUtil.toJsonStr(bean.getData()), MydoJob.class); + if ("1".equals(requestLog.getIsSuccessful())){ + InterfaceReceive bean = JSONUtil.toBean(responseBody, InterfaceReceive.class); + return JSONUtil.toList(JSONUtil.toJsonStr(bean.getData()), MydoJob.class); + }else { + return null; + } + } @Override public GenAgvSchedulingTaskResponse genAgvSchedulingTask(GenAgvSchedulingTaskRequest genAgvSchedulingTaskRequest) { RequestLog requestLog = requestLogService.getRequestLog(GEN_AGV_SCHEDULING_TASK, "生成AGV任务", JSONUtil.toJsonStr(genAgvSchedulingTaskRequest)); - if(requestLog.getIsSuccessful().equals("1")){ + if("1".equals(requestLog.getIsSuccessful())){ return BeanUtil.toBean(requestLog.getResponseBody(), GenAgvSchedulingTaskResponse.class); }else { GenAgvSchedulingTaskResponse response = new GenAgvSchedulingTaskResponse(); response.setCode(500); response.setMessage("请求失败"); - return BeanUtil.toBean(requestLog.getResponseBody(), GenAgvSchedulingTaskResponse.class); + return response; } } @@ -249,6 +254,7 @@ public class ApiServiceImpl implements IApiService { agvQueue.setWmsTaskType("2"); agvQueue.setWmsTraycode(mydoJob.getTrayCode()); agvQueue.setWmsTaskNo(mydoJob.getTaskNo()); + agvQueue.setStatus("0"); int i = agvQueueService.insertAgvQueue(agvQueue); if (i > 0) { log.info("向AGV下任务成功"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java b/ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java index 65efa69..0c00acf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java @@ -19,7 +19,7 @@ public class Constant { public static final String BASEURL_AGV = BASEURL + "/rcms-dps/rest/queryAgvStatus/"; - public static final String GET_MYDOJOB_URL = "http://localhost:8080/api2wms/inJob"; + public static final String GET_MYDOJOB_URL = "http://localhost:8080/api2wms/getJob"; public static final String REQUEST_ENTER = "http://localhost:8080/api2wms/requestEnter"; public static final String UPDATE_MYDOJOB_URL = "http://127.0.0.1:8081/rcms-dps/rest/queryAgvStatus/"; public static final String AGV_FINISH_URL = "http://localhost:8080/api2wms/jobFinish"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsInSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsInSsjThread.java index d48210a..f71c142 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsInSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsInSsjThread.java @@ -94,7 +94,7 @@ public class BsInSsjThread implements Runnable { } } try { - Thread.sleep(3000); + Thread.sleep(1500); } catch (InterruptedException e) { throw new RuntimeException(e); } @@ -113,7 +113,7 @@ public class BsInSsjThread implements Runnable { //判断是否生成队列 AgvQueue agvQueueParam = new AgvQueue(); agvQueueParam.setPositionCode1(lljCode); - agvQueueParam.setStatus("0"); + //agvQueueParam.setStatus("0"); List agvQueues = agvQueueService.selectAgvQueueList(agvQueueParam); if (CollUtil.isEmpty(agvQueues)){ //查询流利架未开始的作业 @@ -160,7 +160,7 @@ public class BsInSsjThread implements Runnable { //判断是否生成队列 AgvQueue agvQueueParam = new AgvQueue(); agvQueueParam.setWmsTraycode(inSsjDevice.getTrayCode()); - agvQueueParam.setStatus("0"); + //agvQueueParam.setStatus("0"); List agvQueues = agvQueueService.selectAgvQueueList(agvQueueParam); if (CollUtil.isEmpty(agvQueues)) { //根据入口,查询对应的入库作业 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsOutSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsOutSsjThread.java index 8595321..528bb5e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsOutSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsOutSsjThread.java @@ -85,7 +85,7 @@ public class BsOutSsjThread implements Runnable { } try { - Thread.sleep(3000); + Thread.sleep(1500); } catch (InterruptedException e) { throw new RuntimeException(e); } @@ -118,9 +118,9 @@ public class BsOutSsjThread implements Runnable { log.info("队列 agvCode {},无对应出库作业", agvQueue.getReqCode()); } } - }else { + }/*else { log.info("ssjCode:{},没有待下发的出库任务", outSsjDevice.getDeviceCode()); - } + }*/ } } @@ -177,9 +177,6 @@ public class BsOutSsjThread implements Runnable { agvQueue.setStatus("1"); agvQueueService.updateAgvQueue(agvQueue); log.info("向CTU下入库库作业"); - //修改mydoJob执行阶段 - mydoJob.setExecutionPhase("6"); - apiService.updateMydoJob(mydoJob); } } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsPickSsjTread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsPickSsjTread.java index ad03b3c..9d42247 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsPickSsjTread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsPickSsjTread.java @@ -71,6 +71,11 @@ public class BsPickSsjTread implements Runnable{ } } } + try { + Thread.sleep(1500); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/js/JsInSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/js/JsInSsjThread.java index 14a624e..a4abc03 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/js/JsInSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/js/JsInSsjThread.java @@ -78,7 +78,7 @@ public class JsInSsjThread implements Runnable { } } try { - Thread.sleep(3000); + Thread.sleep(1500); } catch (InterruptedException e) { throw new RuntimeException(e); } @@ -93,7 +93,7 @@ public class JsInSsjThread implements Runnable { //判断是否生成队列 AgvQueue agvQueueParam = new AgvQueue(); agvQueueParam.setWmsTraycode(inSsjDevice.getTrayCode()); - agvQueueParam.setStatus("0"); + //agvQueueParam.setStatus("0"); List agvQueues = agvQueueService.selectAgvQueueList(agvQueueParam); if (CollUtil.isEmpty(agvQueues)) { //根据入口,查询对应的入库作业 @@ -165,6 +165,7 @@ public class JsInSsjThread implements Runnable { agvQueue.setStatus("0"); agvQueue.setTaskCode(taskCode); agvQueue.setWmsTaskType("1"); + agvQueueService.insertAgvQueue(agvQueue); return agvQueue; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/js/JsOutSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/js/JsOutSsjThread.java index 8cdc95c..0076599 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/js/JsOutSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/js/JsOutSsjThread.java @@ -78,7 +78,7 @@ public class JsOutSsjThread implements Runnable{ } try { - Thread.sleep(3000); + Thread.sleep(1500); } catch (InterruptedException e) { throw new RuntimeException(e); } @@ -141,9 +141,6 @@ public class JsOutSsjThread implements Runnable{ agvQueue.setStatus("1"); agvQueueService.updateAgvQueue(agvQueue); log.info("向CTU下入库库作业"); - //修改mydoJob执行阶段 - mydoJob.setExecutionPhase("6"); - apiService.updateMydoJob(mydoJob); } } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/js/JsPickSsjTread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/js/JsPickSsjTread.java index e7eddfd..0e70f49 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/js/JsPickSsjTread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/js/JsPickSsjTread.java @@ -59,7 +59,7 @@ public class JsPickSsjTread implements Runnable { apiService = SpringUtils.getBean(IApiService.class); agvQueueService = SpringUtils.getBean(IAgvQueueService.class); wcsPortService = SpringUtils.getBean(IWcsPortService.class); - + } @@ -82,6 +82,11 @@ public class JsPickSsjTread implements Runnable { } } } + try { + Thread.sleep(1500); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } } }