From 2ae707e80fb908e6e6af373e4724645f747a2e23 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 30 九月 2023 09:48:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 2a8ed5e..4a3c0a9 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -354,29 +354,6 @@
return locNo;
}
- //妤煎眰杞崲瀵瑰簲鍑哄叆搴撶珯鐐瑰簱浣嶅彿
- public static String levToOutInStaLocNo(Integer lev) {
- String locNo = null;
- if (lev >= 2) {
- lev++;
- }
- switch (lev) {
- case 1:
- locNo = "1800201";
- break;
- case 3:
- locNo = "1800202";
- break;
- case 4:
- locNo = "1800203";
- break;
- case 5:
- locNo = "1800204";
- break;
- }
- return locNo;
- }
-
public static void main(String[] args) {
System.out.println(JSON.toJSONString(getGroupOutsideLoc("0200101")));
}
@@ -500,4 +477,30 @@
return false;
}
+ //妫�娴嬫ゼ灞傛槸鍚︽湁绌挎杞�
+ public static boolean checkLevHasShuttle(Integer lev) {
+ SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
+ for (ShuttleSlave shuttle : slaveProperties.getShuttle()) {
+ //鑾峰彇鍥涘悜绌挎杞︾嚎绋�
+ NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttle.getId());
+ if (shuttleThread == null) {
+ continue;
+ }
+ NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (shuttleProtocol == null) {
+ continue;
+ }
+ String currentLocNo = shuttleProtocol.getCurrentLocNo();
+ if (currentLocNo == null) {
+ continue;
+ }
+
+ if (lev == Utils.getLev(currentLocNo)) {
+ return true;//鎸囧畾妤煎眰鏈夌┛姊溅
+ }
+ }
+
+ return false;//鎸囧畾妤煎眰娌℃湁绌挎杞�
+ }
+
}
--
Gitblit v1.9.1