From eb1fae7313a01f574b3437e86967ebab5188fb24 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Wed, 10 Jan 2024 14:09:41 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E5=A4=8D=E6=97=A0=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E8=B7=AF=E7=BA=BF=E6=97=B6=E5=8F=96=E6=B6=88=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=B4=A2=E5=BC=95=E8=B6=8A=E7=95=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/service/impl/TaskServiceImpl.java | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index f188032..e4a4f29 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -284,8 +284,8 @@ public class TaskServiceImpl extends CommonServiceImpl impleme continue; } if (!ObjectUtil.isEmpty(point_code)) { - if(!(task.getStart_point_code().contains(point_code) - || task.getNext_point_code().contains(point_code))){ + if (!(task.getStart_point_code().contains(point_code) + || task.getNext_point_code().contains(point_code))) { continue; } } @@ -416,8 +416,8 @@ public class TaskServiceImpl extends CommonServiceImpl impleme continue; } if (StrUtil.equals(task.getTask_status(), TaskStatusEnum.READY.getIndex())) { - if((task.getStart_device_code().equals(start_device_code) - || task.getStart_device_code2().equals(start_device_code))){ + if ((task.getStart_device_code().equals(start_device_code) + || task.getStart_device_code2().equals(start_device_code))) { list.add(task); } } @@ -469,8 +469,8 @@ public class TaskServiceImpl extends CommonServiceImpl impleme continue; } if (StrUtil.equals(task.getTask_status(), TaskStatusEnum.BUSY.getIndex())) { - if((task.getStart_device_code().equals(head_start_device_code) - || task.getStart_device_code2().equals(head_start_device_code))){ + if ((task.getStart_device_code().equals(head_start_device_code) + || task.getStart_device_code2().equals(head_start_device_code))) { Instruction instruction = instructionService.findByTaskcodeAndStatus(task.getTask_code()); if (ObjectUtil.isNotEmpty(instruction)) { list.add(task); @@ -940,13 +940,16 @@ public class TaskServiceImpl extends CommonServiceImpl impleme entity.getStart_device_code(), entity.getNext_device_code(), entity.getRoute_plan_code()); - String type = shortPathsList.get(0).getType(); - // != 0 为agv任务 - if (!StrUtil.equals(type, "0")) { - if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")) { - agvService.markComplete(entity.getTask_code()); + if (ObjectUtil.isNotEmpty(shortPathsList)) { + String type = shortPathsList.get(0).getType(); + // != 0 为agv任务 + if (!StrUtil.equals(type, "0")) { + if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")) { + agvService.markComplete(entity.getTask_code()); + } } } + } @Override @@ -1217,8 +1220,8 @@ public class TaskServiceImpl extends CommonServiceImpl impleme instdto.setAgv_inst_type(CommonFinalParam.ONE); instructionservice.create2(instdto); - acsTask.setTask_status(CommonFinalParam.ONE); - this.update(acsTask); + acsTask.setTask_status(CommonFinalParam.ONE); + this.update(acsTask); return instdto; } @@ -1373,7 +1376,6 @@ public class TaskServiceImpl extends CommonServiceImpl impleme } - @Override public TaskDto findByEndCodeAndReady(String device_code) { Iterator var3 = tasks.iterator(); @@ -1392,8 +1394,6 @@ public class TaskServiceImpl extends CommonServiceImpl impleme } - - @Override public TaskDto findByStartCode(String device_code) { Iterator var3 = tasks.iterator(); @@ -1633,7 +1633,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme List list = instructionService.list(Wrappers.lambdaQuery(InstructionMybatis.class)); if (CollUtil.isNotEmpty(list) && list.size() > 0) { for (InstructionMybatis inst : list) { - if(task.getTask_id().equals(inst.getTask_id())){ + if (task.getTask_id().equals(inst.getTask_id())) { JSONObject ins1 = new JSONObject(); ins1.put("task_code", inst.getInstruction_code()); ins1.put("vehicle_code", inst.getVehicle_code()); @@ -1686,7 +1686,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme } @Override - public void downloadTaskTreeLogging(List taskAndInst, HttpServletResponse response) throws IOException { + public void downloadTaskTreeLogging(List taskAndInst, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); for (JSONObject jsonObject : taskAndInst) { Map map = new LinkedHashMap<>(); @@ -1766,7 +1766,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme // } if (StrUtil.equals(task.getStart_device_code(), deviceCode) && StrUtil.equals(task.getTask_status(), TaskStatusEnum.BUSY.getIndex())) { - if (tasks.size()<2){ + if (tasks.size() < 2) { tasks.add(task); } }