From 925b834a3341dbe9f486964a7ad5d1affd7a404d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 十月 2023 13:33:05 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/Utils.java |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 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 c1c8732..1966c36 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -506,4 +506,45 @@
         return false;//鎸囧畾妤煎眰娌℃湁绌挎杞�
     }
 
+    //妫�娴嬪簱浣嶇粍鏄惁瀛樺湪灏忚溅锛屽瓨鍦ㄨ繑鍥炲皬杞﹀彿銆�
+    public static Integer checkGroupLocHasShuttle(List<String> groupLoc) {
+        if (groupLoc == null) {
+            return null;
+        }
+
+        if (groupLoc.isEmpty()) {
+            return null;
+        }
+
+        SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
+        if (slaveProperties == null) {
+            return null;
+        }
+
+        for (String loc : groupLoc) {
+            for (ShuttleSlave slave : slaveProperties.getShuttle()) {
+                NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, slave.getId());
+                if (shuttleThread == null) {
+                    continue;
+                }
+
+                NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+                if (shuttleProtocol == null) {
+                    continue;
+                }
+
+                if (shuttleProtocol.getCurrentLocNo() == null) {
+                    continue;
+                }
+
+                if (shuttleProtocol.getCurrentLocNo().equals(loc)) {
+                    //瀛樺湪灏忚溅
+                    return slave.getId();
+                }
+            }
+        }
+
+        return null;
+    }
+
 }

--
Gitblit v1.9.1