From ea964162520805dd36e740f0a72fa909e78cade0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 20 十二月 2023 13:42:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 2a205e2..da37396 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -7,9 +7,7 @@
import com.zy.core.properties.SlaveProperties;
import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2020/8/27
@@ -224,10 +222,19 @@
*/
public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
int row = getRow(deepLoc);
- int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
- int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
+// int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
+ int shallowRow = getShallowRow(row);
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
+ public static int getShallowRow(Integer row){
+ Map<Integer, Integer> map = new HashMap<>();
+ map.put(1,2);map.put(4,3);
+ map.put(7,8);map.put(10,9);
+ map.put(11,12);map.put(14,13);
+ map.put(15,16);map.put(18,17);
+ map.put(19,20);
+ return map.get(row);
+ }
/**
* 鑾峰彇 娣卞簱浣嶆帓瀵瑰簲鐨勬祬搴撲綅鎺�
--
Gitblit v1.9.1