From a2aea44177045c178af04c03513e6da2938cd301 Mon Sep 17 00:00:00 2001 From: loujf Date: Wed, 20 Jul 2022 10:39:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../instruction/service/impl/InstructionServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index bc076ac..7b5fbf1 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -1288,9 +1288,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu instdto.setExecute_device_code(dto.getNext_device_code()); logServer.log(instdto.getTask_code(),"finishAndCreateNextInst","",JSONObject.fromObject(dto).toString(),"","",now,instdto.getCarno()); + String type = ""; List routeLineDtoList = routeLineService.getShortPathLines(instdto.getStart_device_code(), instdto.getNext_device_code(), instdto.getRoute_plan_code()); - String type = routeLineDtoList.get(0).getType(); - if (type.equals("0")) { + for (int i = 0; i < routeLineDtoList.size(); i++) { + type = routeLineDtoList.get(i).getType(); + } + if (type.equals("0") && acsTask.getTask_type().equals("2")) { //查询关联设备数量 List deviceList = deviceService.queryLinkDeviceByCode(next_device_code); //查询此终点的指令数量