From f1a3407130d88ad15320ab9fcfabd109e5127c78 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 27 四月 2025 14:01:27 +0800
Subject: [PATCH] 获取堆垛机状态及所属巷道库位统计信息
---
src/main/java/com/zy/asrs/task/handler/GhjtHandler.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java b/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
index 9aed379..b9cef6a 100644
--- a/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
@@ -246,11 +246,11 @@
}
// 瀵绘壘涓�涓璐х殑鐩爣搴撲綅锛屽厛娣卞悗娴�
List<LocMast> locMasts1 = locMastMapper.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("crn_no", i).in("row1", s1, s2)
- .le("bay1", columnNum));
+ .le("bay1", columnNum).orderBy("lev1,bay1,row1"));
if (locMasts1.isEmpty()) {
// 娣卞簱浣嶄负绌轰簡锛屽彇娴呭簱浣�
List<LocMast> locMasts2 = locMastMapper.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("crn_no", i).in("row1", q1, q2)
- .le("bay1", columnNum));
+ .le("bay1", columnNum).orderBy("lev1,bay1,row1"));
if (!locMasts2.isEmpty()) {
staLocNo = locMasts2.get(0).getLocNo();
}
@@ -396,6 +396,16 @@
// 瀵绘壘涓�绠变竴鍗风殑锛屾病鏈夌悊璐х殑锛屼笉鍦ㄥ璐у尯鐨勭墿鏂欐槑缁�
List<LocDetl> tallyGoosList = locDetlMapper.selectTallyGoosList(columnNum);
+ // 杩囨护鎺夋湪绠辫鏍煎搴﹀ぇ浜�600鐨�(澶т簬600涓�涓墭鐩樺彧鑳芥斁涓�绠�)
+ tallyGoosList = tallyGoosList.stream().filter(locDetl -> {
+ String[] split = locDetl.getColor().split("\\*");
+ if (split.length == 3) {
+ return Integer.parseInt(split[1]) <= 600;
+ } else {
+ return false;
+ }
+ }).collect(Collectors.toList());
+
// 瀵绘壘婊¤冻鐞嗚揣鏉′欢鐨勪袱涓湪绠�
LocDetl leftLocDetl = null;
LocDetl rightLocDetl = null;
--
Gitblit v1.9.1