From 2f269a156fc820de8ee893475f0d89e0d77a732a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 11 十二月 2023 17:16:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index cc56ed7..ffee264 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -27,25 +27,49 @@
if (split[3].equals("01")){
ints = Arrays.copyOfRange(wcsRow, 0, (wcsRow.length+2-1) / 2);
if (split[4].equals("01")){
- ints = Arrays.copyOfRange(ints, wcsRow.length / 2,wcsRow.length-1);
+ if (ints.length<2){
+
+ }else {
+ ints = Arrays.copyOfRange(ints, ints.length / 2, ints.length);
+ }
}else {
- ints = Arrays.copyOfRange(ints, 0, wcsRow.length / 2);
+ if (ints.length<2){
+
+ }else {
+ ints = Arrays.copyOfRange(ints, ints.length / 2-1,ints.length-1);
+ }
}
}else {
- ints = Arrays.copyOfRange(wcsRow, (wcsRow.length+2-1) / 2,wcsRow.length-1 );
+ ints = Arrays.copyOfRange(wcsRow, (wcsRow.length+2-1) / 2-1,wcsRow.length-1 );
if (split[4].equals("01")){
+ if (ints.length<2){
- ints = Arrays.copyOfRange(ints, 0, wcsRow.length / 2);
+ }else {
+ ints = Arrays.copyOfRange(ints, ints.length / 2-1,ints.length-1);
+ }
}else {
- ints = Arrays.copyOfRange(ints, wcsRow.length / 2,wcsRow.length-1);
+ if (ints.length<2){
+
+ }else {
+ ints = Arrays.copyOfRange(ints, ints.length / 2, ints.length);
+ }
+
+
}
}
int i = ints[0];
String wcsLocNo = "";
- if (i>9){
- wcsLocNo = i+"0"+split[1]+split[2];
+ Integer bay = Integer.parseInt(split[1])+1;
+ String bay2 = "";
+ if (bay>9){
+ bay2 = bay.toString();
}else {
- wcsLocNo = "0"+i+"0"+split[1]+split[2];
+ bay2 = "0"+bay;
+ }
+ if (i>9){
+ wcsLocNo = i+"0"+bay2+split[2];
+ }else {
+ wcsLocNo = "0"+i+"0"+bay2+split[2];
}
@@ -306,7 +330,7 @@
// slaveProperties.setGroupCount(4);
// Integer deepRow = getDeepRow(slaveProperties, 6);
// System.out.println(deepRow);
- String wcsLocNo = getWcsLocNo("06-52-01-01-01");
- System.out.println(wcsLocNo);
+ CrnSlave.CrnStn crnStnByStaNo = getCrnStnByStaNo(235, true);
+ System.out.println(crnStnByStaNo);
}
}
--
Gitblit v1.9.1