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 76dadc8..d9525c2 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 @@ -71,7 +71,7 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { destinations.add(destination(start_point_code, "Load", "1", "1")); destinations.add(destination(next_point_code, "Wait", "5", "1")); } else { - destinations.add(destination(start_point_code, "Load", "1", "1")); + destinations.add(destination(start_point_code, "Load", "1", "3")); destinations.add(destination(next_point_code, "Unload", "1", "1")); } @@ -182,8 +182,23 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { } if ("PauseOnStation".equals(type)) { - - + String startPoint=inst.getStart_point_code(); + Device start_device = deviceAppService.findDeviceByCode(startPoint); + if (start_device.getDeviceDriver() instanceof SiteDeviceDriver) { + SiteDeviceDriver siteDeviceDriver=(SiteDeviceDriver)start_device.getDeviceDriver(); + if(siteDeviceDriver.getMode()!=10) { + try { + siteDeviceDriver.writing(10); + siteDeviceDriver.writing(10); + siteDeviceDriver.writing(10); + siteDeviceDriver.writing(10); + siteDeviceDriver.writing(10); + }catch(Exception e){ + log.error("写入信号失败:{}{}",e,e.getMessage()); + } + } + } + is_feedback = true; } } //等待点等待 @@ -229,22 +244,6 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { .timeout(20000)//超时,毫秒 .execute(); log.info("下发agv任务请求反馈:{}", result2); - String startPoint=inst.getStart_point_code(); - Device start_device = deviceAppService.findDeviceByCode(startPoint); - if (start_device.getDeviceDriver() instanceof SiteDeviceDriver) { - SiteDeviceDriver siteDeviceDriver=(SiteDeviceDriver)start_device.getDeviceDriver(); - if(siteDeviceDriver.getMode()!=10) { - try { - siteDeviceDriver.writing(10); - siteDeviceDriver.writing(10); - siteDeviceDriver.writing(10); - siteDeviceDriver.writing(10); - siteDeviceDriver.writing(10); - }catch(Exception e){ - log.error("写入信号失败:{}{}",e,e.getMessage()); - } - } - } } } //放货的进入前等待和离开等待 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 71f13bc..7b150fc 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 @@ -31,6 +31,9 @@ public class QueryZDAgvTaskStatus { @Autowired ZheDaAgvService agvService; + @Autowired + DeviceAppService deviceAppService; + public void run() throws Exception { try {