From aaf4a5039c86db159587e1299d5c3925adb70489 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 18 十二月 2025 16:16:39 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/Utils.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 2a27fa0..fd191c6 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -140,6 +140,11 @@
 
     //鑾峰彇鍏ュ簱浠诲姟鍙敤鎺�
     public static List<Integer> getInTaskEnableRow() {
+        return getInTaskEnableRow(new ArrayList<>());
+    }
+
+    //鑾峰彇鍏ュ簱浠诲姟鍙敤鎺�
+    public static List<Integer> getInTaskEnableRow(List<Integer> excludeCrnList) {
         List<Integer> list = new ArrayList<>();
         try {
             RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
@@ -201,6 +206,9 @@
                     News.info("鍫嗗灈鏈�:{} 宸茶揪鏈�澶у叆搴撲换鍔℃暟锛屽綋鍓嶄换鍔℃暟:{}", basCrnp.getCrnNo(), inWrkMasts.size());
                     continue;
                 }
+                if (excludeCrnList.contains(basCrnp.getCrnNo())) {
+                    continue;
+                }
                 enabledCrnps.add(basCrnp);
             }
 

--
Gitblit v1.9.1