From 2f8dcd296b25a93b6dd2e5f98d1455883db1f57c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 16 十月 2025 09:27:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 783ec32..9a8ff4b 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -2,12 +2,15 @@
import com.core.common.Arith;
import com.core.common.Cools;
+import com.zy.common.model.LocGroupOrder;
import com.zy.common.properties.SlaveProperties;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+
+import static cn.hutool.poi.excel.sax.ElementName.row;
/**
* Created by vincent on 2020/8/27
@@ -71,28 +74,44 @@
return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
}
- public static List<Integer> getLocRowGroupAsc(SlaveProperties slaveProperties, Integer row) {
- List<List<Integer>> locGroupAsc = slaveProperties.getLocGroupAsc();
- for (List<Integer> group : locGroupAsc) {
- if (group.contains(row)) {
- List<Integer> copy = new ArrayList<>(group);
- return copy;
- }
- }
-
- throw new RuntimeException(row + "鎺�,鏈畾涔夊簱浣嶇粍");
+ public static List<Integer> getLocGroupAsc(SlaveProperties slaveProperties, String locNo) {
+ LocGroupOrder checkOrder = findGroupOrder(slaveProperties, locNo);
+ List<Integer> rowList = checkOrder.getRowList();
+ return new ArrayList<>(rowList);
}
- public static List<Integer> getLocRowGroupDesc(SlaveProperties slaveProperties, Integer row) {
- List<List<Integer>> locGroupAsc = slaveProperties.getLocGroupAsc();
- for (List<Integer> group : locGroupAsc) {
- if (group.contains(row)) {
- List<Integer> copy = new ArrayList<>(group);
- Collections.reverse(copy);
- return copy;
+ public static List<Integer> getLocGroupDesc(SlaveProperties slaveProperties, String locNo) {
+ List<Integer> copy = getLocGroupAsc(slaveProperties, locNo);
+ Collections.reverse(copy);
+ return copy;
+ }
+
+ public static LocGroupOrder findGroupOrder(SlaveProperties slaveProperties, String locNo) {
+ int row1 = Utils.getRow(locNo);
+ int bay1 = Utils.getBay(locNo);
+ List<LocGroupOrder> locGroupAscOrder = slaveProperties.getLocGroupAscOrder();
+
+ LocGroupOrder checkOrder = null;
+ for (LocGroupOrder order : locGroupAscOrder) {
+ if (!order.getRowList().contains(row1)) {
+ continue;
}
+
+ if (bay1 < order.getMinBay()) {
+ continue;
+ }
+
+ if(bay1 > order.getMaxBay()){
+ continue;
+ }
+
+ checkOrder = order;
}
- throw new RuntimeException(row + "鎺�,鏈畾涔夊簱浣嶇粍");
+ if (checkOrder == null) {
+ throw new RuntimeException(locNo + "搴撲綅鍙�,鏈畾涔夊簱浣嶇粍瑙勫垯");
+ }
+
+ return checkOrder;
}
}
--
Gitblit v1.9.1