From f8ee1bea8543296792f23489d142e8b3231cd66c Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 16 十二月 2025 13:52:18 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/utils/Utils.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index ad1411a..66e36d1 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -10,6 +10,7 @@
import com.zy.asrs.service.RowLastnoService;
import com.zy.common.CodeBuilder;
import com.zy.common.model.LocDetlDto;
+import com.zy.common.model.LocGroupOrder;
import com.zy.common.properties.SlaveProperties;
import com.zy.common.service.CommonService;
import com.zy.system.service.UserService;
@@ -631,4 +632,48 @@
return result;
}
+ public static List<Integer> getLocGroupDesc(SlaveProperties slaveProperties, String locNo) {
+ List<Integer> copy = getLocGroupAsc(slaveProperties,locNo);
+ Collections.reverse(copy);
+ return copy;
+ }
+
+ public static String getLocNo(Integer row, int bay, int lev) {
+ return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
+ }
+
+ public static List<Integer> getLocGroupAsc(SlaveProperties slaveProperties, String locNo) {
+ LocGroupOrder checkOrder = findLocGroupOrder(slaveProperties, locNo);
+ List<Integer> rowList = checkOrder.getRowList();
+ return new ArrayList<>(rowList);
+ }
+
+ public static LocGroupOrder findLocGroupOrder(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;
+ }
+
+ if (checkOrder == null){
+ throw new RuntimeException(locNo + "搴撲綅鍙�,鏈畾涔夊簱浣嶇粍瑙勫垯");
+ }
+
+ return checkOrder;
+ }
}
--
Gitblit v1.9.1