From 078554d16ea1bbf9e2a72b7a39a998fe00444484 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sat, 3 Aug 2024 15:43:30 +0800 Subject: [PATCH] fix: notIn(SchBasePoint::getParent_point_code, noInCodes) --- .../org/nl/wms/sch/task_manage/task/tasks/kj/KJSKTask.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/kj/KJSKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/kj/KJSKTask.java index f3826d6..9ed8b66 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/kj/KJSKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/kj/KJSKTask.java @@ -33,6 +33,7 @@ import org.springframework.stereotype.Component; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * @Author: lyd @@ -103,6 +104,7 @@ public class KJSKTask extends AbstractTask { * @return */ private SchBasePoint findNextPoint(List nextRegionStr, JSONObject jsonObject) { + List noInCodes = Stream.of("ZCSSX05", "ZCSSX06").collect(Collectors.toList()); SchBasePoint device = pointService.getById(jsonObject.getString("device_code")); // 先找暂存输送线有没有空位 List zcssxList = pointService.list(new LambdaQueryWrapper() @@ -113,7 +115,8 @@ public class KJSKTask extends AbstractTask { .eq(SchBasePoint::getCan_vehicle_type, device.getCan_vehicle_type()) .eq(SchBasePoint::getIs_used, true) .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode()) - .eq(SchBasePoint::getPoint_type, PointTypeConstant.ENTRANCE)); + .eq(SchBasePoint::getPoint_type, PointTypeConstant.ENTRANCE) + .notIn(SchBasePoint::getParent_point_code, noInCodes)); if (zcssxList.size() == 0) { // 如果暂存输送线找不到，就去暂存位存放。 // 1、先获取相同类型且不是最开始的位置（最外面1，最里面2）