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 cbcf6b2..5c4bb6e 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 @@ -434,7 +434,7 @@ public class ApiServiceImpl implements IApiService { @Override public AjaxResult selectMydoJobByNoTrayCode(Map param) { RequestLog requestLog = requestLogService.getRequestLog(REQUEST_MYDO_JOB_URL, "入库请求补码作业", JSONUtil.toJsonStr(param)); - if ("1".equals(requestLog.getIsSuccessful())) { + if ("0".equals(requestLog.getIsSuccessful())) { InterfaceReceive bean = JSONUtil.toBean(requestLog.getResponseBody(), InterfaceReceive.class); return AjaxResult.success(bean.getData()); } else { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/JobCallBackServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/JobCallBackServiceImpl.java index 0f98579..939c8e7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/JobCallBackServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/JobCallBackServiceImpl.java @@ -124,7 +124,7 @@ public class JobCallBackServiceImpl implements IJobCallBackService param.put("taskNo", jobCallBack.getTaskNo()); param.put("wmsType", jobCallBack.getType()); RequestLog requestLog = apiService.finishMydoJob(param); - if ("1".equals(requestLog.getIsSuccessful())){ + if ("0".equals(requestLog.getIsSuccessful())){ jobCallBack.setStatus("1"); jobCallBackMapper.updateJobCallBack(jobCallBack); }else{ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java index ceaa633..25a6520 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java @@ -102,6 +102,7 @@ public class DdjThread implements Runnable { if (mydoJob != null && ddjDeviceExecutionQueue != null) { //回传完成信号 ddjTaskFinish(rwh, ddj.getId()); + log.info("堆垛机："+ddj.getId()+"任务完成，任务号："+ddj.getRwh()); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2InOutSsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2InOutSsjThread.java index 83b88f3..96840f9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2InOutSsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2InOutSsjThread.java @@ -117,15 +117,15 @@ public class Floor2InOutSsjThread implements Runnable { } //允许放货 -// if (!agvQueues.isEmpty() && inSsjDevice.getAllowPut() == 2) { -// log.info("设备：{} 位置：{} 任务号：{} 请求放货成功", inSsjDevice.getDeviceCode(), "输送线", agvQueues.get(0).getWmsTaskNo()); -// AjaxResult ajaxResult = apiService.continueTask(agvQueues.get(0)); -// if (ajaxResult.isSuccess()) { -// log.info("下发agv允许放货成功" + agvQueues.get(0).getWmsTaskNo()); -// agvQueues.get(0).setStatus("6"); -// agvQueueService.updateAgvQueue(agvQueues.get(0)); -// } -// } + if (!agvQueues.isEmpty() && inSsjDevice.getAllowPut() == 2) { + log.info("设备：{} 位置：{} 任务号：{} 请求放货成功", inSsjDevice.getDeviceCode(), "输送线", agvQueues.get(0).getWmsTaskNo()); + AjaxResult ajaxResult = apiService.continueTask(agvQueues.get(0)); + if (ajaxResult.isSuccess()) { + log.info("下发agv允许放货成功" + agvQueues.get(0).getWmsTaskNo()); + agvQueues.get(0).setStatus("6"); + agvQueueService.updateAgvQueue(agvQueues.get(0)); + } + } } //入库下发输送线 if (inSsjDevice.getKx() == 0 && inSsjDevice.getTaskNo() == 0) { 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 eeb3290..c524237 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 @@ -200,35 +200,38 @@ public class LineSsjThread implements Runnable { AjaxResult ajaxResult = apiService.selectMydoJobByNoTrayCode(paramMap); if (ajaxResult.isSuccess()) { MydoJob mydoJob2 = BeanUtil.toBean(ajaxResult.get("data"), MydoJob.class); - mydoJob2.setStatus("1"); - mydoJob2.setExecutionPhase("0"); - mydoJob2.setCreateTime(new Date()); - mydoJob2.setTraySize(Convert.toStr(SsjDevice.getTraySize())); - mydoJob2.setFaultFlag("0"); - mydoJobService.insertMydoJob(mydoJob2); - int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), mydoJob2.getTaskNo(), 1, 1); - if (i == 1) { - mydoJob2.setExecutionPhase(TASK_EP_LINE_SSJ); - mydoJobService.updateMydoJob(mydoJob2); - log.info("G1005产线输送机下发任务号成功:" + mydoJob2.getTaskNo()); + if (mydoJob2 != null) { + mydoJob2.setStatus("1"); + mydoJob2.setExecutionPhase("0"); + mydoJob2.setCreateTime(new Date()); + mydoJob2.setTraySize(Convert.toStr(SsjDevice.getTraySize())); + mydoJob2.setFaultFlag("0"); + mydoJobService.insertMydoJob(mydoJob2); + int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), mydoJob2.getTaskNo(), 1, 1); + if (i == 1) { + mydoJob2.setExecutionPhase(TASK_EP_LINE_SSJ); + mydoJobService.updateMydoJob(mydoJob2); + log.info("G1005产线输送机下发任务号成功:" + mydoJob2.getTaskNo()); + } } + } else if (ajaxResult.isError()) { //超大,给plc下发错误信息，等待人工处理 //托盘大小对不上，给plc下发错误信息，等待人工处理 //码不对，给plc下发错误信息，等待人工处理 - if ((Integer) ajaxResult.get("code") == 5) { - int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), "2222", 1, 1); - if (i == 1) { - log.info("G1005产线输送机下发错误信息成功"); - } - createMoveToPort(SsjDevice); - } else { - int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), "99", Integer.parseInt(ajaxResult.get("code").toString()), 2); - if (i == 1) { - log.info("G1005产线输送机下发错误信息成功"); - } - } +// if ((Integer) ajaxResult.get("code") == 5) { +// int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), "2222", 1, 1); +// if (i == 1) { +// log.info("G1005产线输送机下发错误信息成功"); +// } +// createMoveToPort(SsjDevice); +// } else { +// int i = writeToSsj(SsjDevice.getPlcDbWriteAddress(), "99", Integer.parseInt(ajaxResult.get("code").toString()), 2); +// if (i == 1) { +// log.info("G1005产线输送机下发错误信息成功"); +// } +// } } } @@ -236,7 +239,7 @@ public class LineSsjThread implements Runnable { if (SsjDevice.getDw() == 1 && SsjDevice.getTaskNo() > 1000) { - log.info("设备：{} 位置：{} 条码：{} 托盘大小：{}", SsjDevice.getDeviceCode(), "产线收到wcs任务号", SsjDevice.getTrayCode(), SsjDevice.getTraySize()); + //log.info("设备：{} 位置：{} 条码：{} 托盘大小：{}", SsjDevice.getDeviceCode(), "产线收到wcs任务号", SsjDevice.getTrayCode(), SsjDevice.getTraySize()); //任务号查wcs作业，查巷道，看目标输送线是否空闲，查是否有出库作业，生成agv队列 MydoJob mydoJob = mydoJobService.selectMydoJobByTaskNo(Convert.toLong(SsjDevice.getTaskNo())); @@ -259,14 +262,14 @@ public class LineSsjThread implements Runnable { //查是否有队列，如果有了请求放货修改为允许放货 AgvQueue agvQueue = agvQueueService.selectAgvQueueByTaskCode(mydoJob.getJobId()); if (agvQueue != null) { -// if ("3".equals(mydoJob.getStatus()) && "2".equals(agvQueue.getStatus()) && SsjDevice.getAllowPut() == 1) { -// AjaxResult ajaxResult = apiService.continueTask(agvQueue); -// if (ajaxResult.isSuccess()) { -// log.info("给agv下发允许取货继续任务成功" + agvQueue.getWmsTaskNo()); -// agvQueue.setStatus("2"); -// agvQueueService.updateAgvQueue(agvQueue); -// } -// } + if ("3".equals(mydoJob.getStatus()) && "2".equals(agvQueue.getStatus()) && SsjDevice.getAllowPut() == 1) { + AjaxResult ajaxResult = apiService.continueTask(agvQueue); + if (ajaxResult.isSuccess()) { + log.info("给agv下发允许取货继续任务成功" + agvQueue.getWmsTaskNo()); + agvQueue.setStatus("2"); + agvQueueService.updateAgvQueue(agvQueue); + } + } if("0".equals(agvQueue.getStatus())){ apiService.requestAgvQueue(agvQueue); } @@ -274,7 +277,7 @@ public class LineSsjThread implements Runnable { if ("1".equals(mydoJob.getStatus())) { HashMap paramMap = new HashMap<>(); paramMap.put("trayCode", mydoJob.getTrayCode()); - paramMap.put("taskCode",mydoJobParam.getJobId()); + paramMap.put("taskCode",mydoJob.getJobId()); //todo 与agv对点 paramMap.put("startPoint", "G1005"); paramMap.put("endPoint", deviceCode); @@ -294,14 +297,14 @@ public class LineSsjThread implements Runnable { if (SsjDevice.getDw() == 1 && SsjDevice.getTaskNo() == 2222 && SsjDevice.getTraySize() == 4) { AgvQueue agvQueue = agvQueueService.selectAgvQueueByWmsTask(SsjDevice.getTaskNo()); if (agvQueue != null) { -// if ("2".equals(agvQueue.getStatus()) && SsjDevice.getAllowPut() == 1) { -// AjaxResult ajaxResult = apiService.continueTask(agvQueue); -// if (ajaxResult.isSuccess()) { -// log.info("给agv下发允许取货继续任务成功" + agvQueue.getWmsTaskNo()); -// agvQueue.setStatus("2"); -// agvQueueService.updateAgvQueue(agvQueue); -// } -// } + if ("2".equals(agvQueue.getStatus()) && SsjDevice.getAllowPut() == 1) { + AjaxResult ajaxResult = apiService.continueTask(agvQueue); + if (ajaxResult.isSuccess()) { + log.info("给agv下发允许取货继续任务成功" + agvQueue.getWmsTaskNo()); + agvQueue.setStatus("2"); + agvQueueService.updateAgvQueue(agvQueue); + } + } if("0".equals(agvQueue.getStatus())){ apiService.requestAgvQueue(agvQueue); }