From 0a379c6fefa6dee0ce4436a25fb78d0da4ba6793 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 17 四月 2025 15:15:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 9 +++++++--
src/main/java/com/zy/common/utils/ForkLiftUtils.java | 15 +++++++++++++++
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 4685e64..6192205 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1772,9 +1772,14 @@
continue;
}
+ List<Integer> liftAllStaNo = ForkLiftUtils.getLiftAllStaNo(liftNo);
+ if (liftAllStaNo.isEmpty()) {
+ continue;
+ }
+
//鑾峰彇鍏ュ簱浠诲姟
List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("lift_no", liftNo)
+ .in("sta_no", liftAllStaNo)
.in("wrk_sts"
, WrkStsType.NEW_INBOUND.sts
, WrkStsType.INBOUND_DEVICE_RUN.sts
@@ -1786,7 +1791,7 @@
//鑾峰彇鍑哄簱浠诲姟
List<WrkMast> outWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("lift_no", liftNo)
+ .in("source_sta_no", liftAllStaNo)
.in("wrk_sts"
, WrkStsType.NEW_OUTBOUND.sts
, WrkStsType.OUTBOUND_SHUTTLE_RUN.sts
diff --git a/src/main/java/com/zy/common/utils/ForkLiftUtils.java b/src/main/java/com/zy/common/utils/ForkLiftUtils.java
index 045054a..fd005e4 100644
--- a/src/main/java/com/zy/common/utils/ForkLiftUtils.java
+++ b/src/main/java/com/zy/common/utils/ForkLiftUtils.java
@@ -24,6 +24,21 @@
*/
public class ForkLiftUtils {
+ //鑾峰彇鎻愬崌鏈烘墍鏈夌珯鐐�
+ public static List<Integer> getLiftAllStaNo(Integer liftNo) {
+ List<Integer> list = new ArrayList<>();
+ ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, liftNo);
+ if (forkLiftThread == null) {
+ return list;
+ }
+
+ for (ForkLiftStaProtocol forkLiftStaProtocol : forkLiftThread.getForkLiftStaProtocols()) {
+ list.add(forkLiftStaProtocol.getStaNo());
+ }
+
+ return list;
+ }
+
//鑾峰彇鎻愬崌鏈虹珯鐐�
public static ForkLiftStaProtocol getLiftStaByStaNo(Integer staNo) {
SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
--
Gitblit v1.9.1