From 8280c9eee52dd9fa3501305dfd4d1cab1564a73b Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期六, 20 十二月 2025 15:01:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 5d44238..1222a32 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -141,11 +141,11 @@
//鑾峰彇鍏ュ簱浠诲姟鍙敤鎺�
public static List<Integer> getInTaskEnableRow() {
- return getInTaskEnableRow(new ArrayList<>());
+ return getInTaskEnableRow(new ArrayList<>(), true);
}
//鑾峰彇鍏ュ簱浠诲姟鍙敤鎺�
- public static List<Integer> getInTaskEnableRow(List<Integer> excludeCrnList) {
+ public static List<Integer> getInTaskEnableRow(List<Integer> excludeCrnList, boolean maxInTaskControl) {
List<Integer> list = new ArrayList<>();
try {
RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
@@ -202,7 +202,7 @@
.eq("io_type", WrkIoType.IN.id)
);
// 妫�鏌ユ槸鍚﹁秴杩囨渶澶у叆搴撲换鍔℃暟
- if(inWrkMasts.size() >= basCrnp.getMaxInTask()){
+ if (maxInTaskControl && inWrkMasts.size() >= basCrnp.getMaxInTask()) {
News.info("鍫嗗灈鏈�:{} 宸茶揪鏈�澶у叆搴撲换鍔℃暟锛屽綋鍓嶄换鍔℃暟:{}", basCrnp.getCrnNo(), inWrkMasts.size());
continue;
}
@@ -220,7 +220,7 @@
list.addAll(rows);
}
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
return list;
--
Gitblit v1.9.1