From 9a1a15332a745956b665e35ebe3cdc40eea9e43d Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 22 十月 2024 14:11:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 57 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..eda8910 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -3,13 +3,12 @@
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.entity.LocMast;
import com.zy.core.model.CrnSlave;
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 +83,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 +223,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 +382,48 @@
// 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);
}
+
+ public static Integer StaNoCrnNo(Integer staNo) {
+ switch (staNo){
+ case 100:
+ case 101:
+ return 1;
+ case 102:
+ case 103:
+ return 2;
+ case 104:
+ case 105:
+ return 3;
+ case 106:
+ case 107:
+ return 4;
+ default:
+ return 0;
+ }
+ }
+
+ public static boolean locNoRowBoolean(Integer row) {
+ switch (row){
+ case 1:
+ case 2:
+ case 4:
+ case 5:
+ case 8:
+ case 9:
+ case 11:
+ case 12:
+ return true;
+ case 3:
+ case 6:
+ case 7:
+ case 10:
+ case 13:
+ default:
+ return false;
+ }
+ }
+
}
--
Gitblit v1.9.1