From 135a1341621d7de38132aba7b6174c651492ba0e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 22 四月 2025 12:56:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 7 ++++++-
src/main/java/com/zy/common/utils/ForkLiftUtils.java | 27 +++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 1 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 118d72d..893a5ee 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1809,6 +1809,11 @@
continue;
}
+ List<Integer> conveyorBindLiftAllStaNo = ForkLiftUtils.getConveyorBindLiftAllStaNo(liftNo);
+ if (conveyorBindLiftAllStaNo.isEmpty()) {
+ continue;
+ }
+
//鑾峰彇鍏ュ簱浠诲姟
List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
.in("sta_no", liftAllStaNo)
@@ -1823,7 +1828,7 @@
//鑾峰彇鍑哄簱浠诲姟
List<WrkMast> outWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("lift_no", liftNo)
+ .eq("sta_no", conveyorBindLiftAllStaNo)
.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 fd005e4..a7dbe75 100644
--- a/src/main/java/com/zy/common/utils/ForkLiftUtils.java
+++ b/src/main/java/com/zy/common/utils/ForkLiftUtils.java
@@ -39,6 +39,33 @@
return list;
}
+ //鑾峰彇鎻愬崌鏈烘墍缁戝畾鐨勮緭閫佺嚎鎵�鏈夌珯鐐�
+ public static List<Integer> getConveyorBindLiftAllStaNo(Integer liftNo) {
+ List<Integer> list = new ArrayList<>();
+ ConfigService configService = SpringUtils.getBean(ConfigService.class);
+ if (configService == null) {
+ return list;
+ }
+
+ Config conveyorLiftBindConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "conveyorLiftBind"));
+ if(conveyorLiftBindConfig == null) {
+ return list;
+ }
+
+ List<JSONObject> val = JSON.parseArray(conveyorLiftBindConfig.getValue(), JSONObject.class);
+ if (val.isEmpty()) {
+ return list;
+ }
+
+ for (JSONObject data : val) {
+ if(data.getInteger("liftNo").equals(liftNo)) {
+ list.add(data.getInteger("staNo"));
+ }
+ }
+
+ return list;
+ }
+
//鑾峰彇鎻愬崌鏈虹珯鐐�
public static ForkLiftStaProtocol getLiftStaByStaNo(Integer staNo) {
SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
--
Gitblit v1.9.1