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()); } } }