From eb6b79b6dcb4b8d659477d03cb290c1df4179d14 Mon Sep 17 00:00:00 2001 From: songxiaopeng <1393756821@qq.com> Date: Tue, 9 Apr 2024 17:07:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=89=8B=E6=8C=81=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJMLTask.java | 1 + .../java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJQKTask.java | 1 + .../org/nl/wms/sch/task_manage/task/tasks/yz/YZSLWHKTask.java | 1 + 3 files changed, 3 insertions(+) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJMLTask.java index 1a5d092..9dd1cbf 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJMLTask.java @@ -122,6 +122,7 @@ public class CBJMLTask extends AbstractTask { .eq(SchBasePoint::getIng_task_code, "")) .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode()) .eq(SchBasePoint::getIs_used, true) + .notLike(SchBasePoint::getPoint_code,"CBJ%") .orderByAsc(SchBasePoint::getUpdate_time) .orderByAsc(SchBasePoint::getIn_order_seq) .orderByAsc(SchBasePoint::getPoint_code)); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJQKTask.java index 4d3261d..add0154 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJQKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJQKTask.java @@ -132,6 +132,7 @@ public class CBJQKTask extends AbstractTask { .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住 .or() .eq(SchBasePoint::getIng_task_code, "")) + .notLike(SchBasePoint::getPoint_code,"CBJ%") .orderByAsc(SchBasePoint::getUpdate_time) .orderByAsc(SchBasePoint::getIn_order_seq); List schBasePoints = pointService.list(lam); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLWHKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLWHKTask.java index d85d813..6a4e39f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLWHKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLWHKTask.java @@ -138,6 +138,7 @@ public class YZSLWHKTask extends AbstractTask { .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住 .or() .eq(SchBasePoint::getIng_task_code, "")) + .notLike(SchBasePoint::getPoint_code,"CBJ%") .eq(SchBasePoint::getIs_used, true) .orderByAsc(SchBasePoint::getIn_order_seq) .orderByAsc(SchBasePoint::getPoint_code);