From 6400dadef7260f79dc50844ec3ae0411737e5a30 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Wed, 11 Dec 2024 13:08:54 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=8F=96=E6=B6=88=E8=BE=93=E9=80=81?= =?UTF-8?q?=E7=BA=BF=E8=A7=A6=E5=8F=91=E9=80=81=E7=A9=BA=E6=9E=B6=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=EF=BC=8C=E5=86=99=E5=85=A5=E4=BF=A1=E5=8F=B77?= =?UTF-8?q?=EF=BC=9B=20=20=20=20=20=E5=A2=9E=E5=8A=A0=E5=AD=90=E6=AF=8D?= =?UTF-8?q?=E8=BD=A6=E5=8F=96=E8=B4=A7=E5=AE=8C=E6=88=90=E5=86=99=E5=85=A5?= =?UTF-8?q?=E8=BE=93=E9=80=81=E7=BA=BF=E4=BF=A1=E5=8F=B7=E6=97=A5=E5=BF=97?= =?UTF-8?q?=EF=BC=8C=E5=BE=85=E8=A7=82=E5=AF=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java | 3 ++- .../acs/device_driver/tianneng/site/SiteDeviceDriver.java | 8 ++++---- .../java/org/nl/quartz/task/QueryZDAgvTaskStatus.java | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java index ef39e9e..8e67c36 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java @@ -192,8 +192,9 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { siteDeviceDriver.writing(10); siteDeviceDriver.writing(10); siteDeviceDriver.writing(10); + log.error("子母车取货完成，离开，第1次写入{}输送线信号成功！",siteDeviceDriver.getDeviceCode()); }catch(Exception e){ - log.error("写入信号失败：{}{}",e,e.getMessage()); + log.error("子母车取货完成，离开，第1次写入{}信号失败：{}{}",siteDeviceDriver.getDeviceCode(),e,e.getMessage()); } } } 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 b8f6728..50cdcf8 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 @@ -420,11 +420,11 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD jsonObject.put("requestNo", IdUtil.simpleUUID()); switch (type) { case 7: - if(device_code.startsWith("ZCSSX")) { - jsonObject.put("request_method_code", "KJQKTask"); - }else{ + // if(device_code.startsWith("ZCSSX")) { + // jsonObject.put("request_method_code", "KJQKTask"); + // }else{ jsonObject.put("request_method_code", "TBXQKTask"); - } + // } break; case 8: jsonObject.put("request_method_code", "KJSKTask"); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java index d94420e..c2582bf 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java @@ -84,8 +84,9 @@ public class QueryZDAgvTaskStatus { siteDeviceDriver.writing(10); siteDeviceDriver.writing(10); siteDeviceDriver.writing(10); + log.error("子母车反馈任务完成，第2次写入{}输送线信号成功！",siteDeviceDriver.getDeviceCode()); }catch(Exception e){ - log.error("RGV反馈任务完成，写入检测站点驱动信号失败：{}{}",e,e.getMessage()); + log.error("子母车反馈任务完成，第2次写入检测站点驱动信号失败：{}{}",e,e.getMessage()); } } }