root/xinFengTianNeng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

浙大调度fix

Browse Source
This commit is contained in:
psh
2024-06-13 09:52:11 +08:00
parent db29947eb9
commit 99eee485ba
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java
View File

@@ -71,7 +71,7 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
destinations.add(destination(start_point_code, "Load", "1", "1")); destinations.add(destination(start_point_code, "Load", "1", "1"));
destinations.add(destination(next_point_code, "Wait", "5", "1")); destinations.add(destination(next_point_code, "Wait", "5", "1"));
} else { } 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")); destinations.add(destination(next_point_code, "Unload", "1", "1"));
} }
@@ -182,8 +182,23 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
} }
if ("PauseOnStation".equals(type)) { 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)//超时，毫秒 .timeout(20000)//超时，毫秒
.execute(); .execute();
log.info("下发agv任务请求反馈:{}", result2); 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());
}
}
}
} }
} }
//放货的进入前等待和离开等待 //放货的进入前等待和离开等待

3
acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java
View File

@@ -31,6 +31,9 @@ public class QueryZDAgvTaskStatus {
@Autowired @Autowired
ZheDaAgvService agvService; ZheDaAgvService agvService;
@Autowired
DeviceAppService deviceAppService;
public void run() throws Exception { public void run() throws Exception {
try { try {