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

优化

Browse Source
This commit is contained in:
loujf
2022-07-20 10:39:50 +08:00
parent 1d3d164dfc
commit a2aea44177
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -1288,9 +1288,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
instdto.setExecute_device_code(dto.getNext_device_code()); instdto.setExecute_device_code(dto.getNext_device_code());
logServer.log(instdto.getTask_code(),"finishAndCreateNextInst","",JSONObject.fromObject(dto).toString(),"","",now,instdto.getCarno()); logServer.log(instdto.getTask_code(),"finishAndCreateNextInst","",JSONObject.fromObject(dto).toString(),"","",now,instdto.getCarno());
String type = "";
List<RouteLineDto> routeLineDtoList = routeLineService.getShortPathLines(instdto.getStart_device_code(), instdto.getNext_device_code(), instdto.getRoute_plan_code()); List<RouteLineDto> routeLineDtoList = routeLineService.getShortPathLines(instdto.getStart_device_code(), instdto.getNext_device_code(), instdto.getRoute_plan_code());
String type = routeLineDtoList.get(0).getType(); for (int i = 0; i < routeLineDtoList.size(); i++) {
if (type.equals("0")) { type = routeLineDtoList.get(i).getType();
}
if (type.equals("0") && acsTask.getTask_type().equals("2")) {
//查询关联设备数量 //查询关联设备数量
List<String> deviceList = deviceService.queryLinkDeviceByCode(next_device_code); List<String> deviceList = deviceService.queryLinkDeviceByCode(next_device_code);
//查询此终点的指令数量 //查询此终点的指令数量