From 3ac9f524f1f751015a3882f08d631233208953dc Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 30 一月 2024 08:57:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 43b62ce..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
@@ -84,7 +82,7 @@
}
}
}else {
- ints = Arrays.copyOfRange(wcsRow, (wcsRow.length+2-1) / 2-1,wcsRow.length-1 );
+ ints = Arrays.copyOfRange(wcsRow, (wcsRow.length+2-1) / 2,wcsRow.length );
if (split[4].equals("01")){
if (ints.length<2){
@@ -224,9 +222,18 @@
*/
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);
}
/**
@@ -374,7 +381,7 @@
// slaveProperties.setGroupCount(4);
// Integer deepRow = getDeepRow(slaveProperties, 6);
// System.out.println(deepRow);
-
- System.out.println(getWmsLocNo("1900201"));
+ String wcsLocNo = getWcsLocNo("01-01-01-01-01");
+ System.out.println(wcsLocNo);
}
}
--
Gitblit v1.9.1