From ee7898da4ba4a164a3d579f2e6d5d40180d2ea42 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Tue, 27 Aug 2024 15:47:02 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E8=BE=93=E9=80=81=E7=BA=BF=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=BB=E5=8A=A1=E4=B8=8D=E5=81=9A=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=EF=BC=8C=E7=94=B1agv?= =?UTF-8?q?=E8=87=AA=E8=A1=8C=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/sch/task_manage/AbstractTask.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java index 79891a1..aee1b05 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java @@ -173,10 +173,15 @@ public abstract class AbstractTask { SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper() .eq(SchBaseTaskconfig::getConfig_code, config_code)); Assert.notNull(taskConfig, "找不到配置文件，请确认[" + config_code + "]配置是否存在！"); - //判断该申请点位是否存在起点或终点的未完成任务 - List apply_point_lists = taskService.findUnFinishTasksByPoint_code2("",apply_point_code); - Assert.isFalse(apply_point_lists.size()>0, - "该任务申请点位["+apply_point_code+"]已存在未完成的任务，无法申请任务!"); + //输送线相关任务不做处理 + if(apply_point_code.startsWith("SSX")){ + //放行 + }else{ + //判断该申请点位是否存在起点或终点的未完成任务 + List apply_point_lists = taskService.findUnFinishTasksByPoint_code2("",apply_point_code); + Assert.isFalse(apply_point_lists.size()>0, + "该任务申请点位["+apply_point_code+"]已存在未完成的任务，无法申请任务!"); + } // 最大可创建任务数 Integer tcmn = taskConfig.getTask_create_max_num(); // 获取申请的任务