From 7a48e3bdb861f287f2288225a3e0d2b93b3b0442 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 31 三月 2025 09:15:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 24 ++++++++++++++++++++----
1 files changed, 20 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 8d2466b..bf3ea83 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -5,7 +5,9 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.NavigateNode;
import com.zy.common.model.enums.NavigationMapType;
import com.zy.common.utils.NavigatePositionConvert;
@@ -19,9 +21,6 @@
import java.text.DecimalFormat;
import java.util.*;
-/**
- * Created by vincent on 2020/8/27
- */
public class Utils {
private static final DecimalFormat fmt = new DecimalFormat("##0.00");
@@ -145,9 +144,10 @@
return list;
}
- //妫�娴嬫ゼ灞傛槸鍚︽湁绌挎杞�
+ //妫�娴嬫ゼ灞傛槸鍚︽湁鍙敤绌挎杞�
public static boolean checkLevHasShuttle(Integer lev) {
SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
+ WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
for (ShuttleSlave shuttle : slaveProperties.getShuttle()) {
//鑾峰彇鍥涘悜绌挎杞︾嚎绋�
ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttle.getId());
@@ -163,6 +163,22 @@
continue;
}
+ //灏忚溅姝ｅ湪鍏呯數
+ if (shuttleThread.isCharging()) {
+ continue;
+ }
+
+ //灏忚溅鏈夊厖鐢典换鍔�
+ WrkMast chargeWorking = wrkMastService.selectChargeWorking(shuttleProtocol.getShuttleNo());
+ if (chargeWorking != null) {//宸叉湁鍏呯數浠诲姟
+ continue;
+ }
+
+ //灏忚溅澶勪簬鏁呴殰鐘舵��
+ if (shuttleThread.isFault()) {
+ continue;
+ }
+
if (lev == Utils.getLev(currentLocNo)) {
return true;//鎸囧畾妤煎眰鏈夌┛姊溅
}
--
Gitblit v1.9.1