From d1c869bbc5ca072aa64f9845a8b1795b5b629537 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Thu, 19 Dec 2024 15:17:12 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=A2=9E=E5=8A=A0agv=E5=8F=96=E7=A9=BA?= =?UTF-8?q?=E6=9E=B6=EF=BC=8C=E5=86=99=E5=85=A5=E7=A1=AE=E8=AE=A4=E4=BF=A1?= =?UTF-8?q?=E5=8F=B710=E5=8F=96=E8=B4=A7=E5=AE=8C=E6=88=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/ndcone/AgvNdcOneDeviceDriver.java | 5 +++ .../tianneng/site/SiteDeviceDriver.java | 41 ++++++++++--------- .../org/nl/quartz/task/SyncDeviceStatus.java | 2 +- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index bbd2fcf..e1788f6 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -217,6 +217,11 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic logServer.deviceExecuteLog(this.device_code, "", "", "对应设备号为空" + device_code); return; } + if (device.getDeviceDriver() instanceof SiteDeviceDriver) { + SiteDeviceDriver siteDeviceDriver = (SiteDeviceDriver) device.getDeviceDriver(); + //输送线对接，增加取货完成写入确认信号10 + siteDeviceDriver.writing(10); + } //校验agv上报站点编号与指令起始点相同 if (ObjectUtil.isEmpty(inst)) { log.info("未找到关联编号{}对应的指令", ikey); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java index 9eeb9de..7bcb654 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java @@ -216,32 +216,31 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD case 2: break; case 5: - //申请空盘 + //输送线申请空盘 if (move == 0 && !requireSucess) { log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",满足请求条件，发出请求空架任务"); apply(5); } break; case 6: - //空托盘出库，协议重新约，无此业务 - // if(move==1 && !requireSucess){ - // apply(6); - // } - // break; - // case 7: - // //申请空盘，协议重新约定位5 - // if (move==0 && !requireSucess){ - // apply(7); - // } - // break; - // case 8: - // //空托盘出库，协议重新约，无此业务 - // if(move==1 && !requireSucess){ - // apply(8); - // } - // break; + //空托盘出库 + if (move == 1 && !requireSucess) { + apply(6); + } + break; + case 7: + //涂板线申请空盘 + if (move == 0 && !requireSucess) { + apply(7); + } + break; + case 8: + //空托盘出库 + if (move == 1 && !requireSucess) { + apply(8); + } + break; } - switch (flag) { //取货完成 case 1: @@ -416,11 +415,15 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD switch (type) { case 5: if (device_code.startsWith("ZCSSX")) { + log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",满足请求条件，发出请求空架任务"); jsonObject.put("request_method_code", "KJQKTask"); } else { jsonObject.put("request_method_code", "TBXQKTask"); } break; + case 7: + jsonObject.put("request_method_code", "TBXQKTask"); + break; case 8: jsonObject.put("request_method_code", "KJSKTask"); break; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java index 9d6657a..d2a68bb 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java @@ -246,7 +246,7 @@ public class SyncDeviceStatus { redisUtils.set("agv", agv); // log.trace("自动上报驱动状态，完毕耗时{}", System.currentTimeMillis() - startTime); } catch (Exception e) { - log.error("自动线程开始查询AGV设备，自动上报驱动状态失败{}{}", e, e.getMessage()); + log.error("tofix自动线程开始查询AGV设备，自动上报驱动状态失败{}{}", e, e.getMessage()); } } }