From e4d5a0e37babc1ae214c34162e58f5084927d301 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 十二月 2023 14:26:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld
---
src/main/java/com/zy/asrs/utils/Utils.java | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 367f9ca..b1b7e5c 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -2,6 +2,8 @@
import com.core.common.Arith;
import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.core.model.CrnSlave;
import com.zy.core.properties.SlaveProperties;
import java.text.DecimalFormat;
@@ -23,27 +25,34 @@
int[] wcsRow = getWcsRow(split[0]);
int[] ints = null;
if (split[3].equals("01")){
- ints = Arrays.copyOfRange(wcsRow, 0, wcsRow.length / 2);
+ 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);
+ ints = Arrays.copyOfRange(ints, ints.length / 2-1,ints.length-1);
}else {
ints = Arrays.copyOfRange(ints, 0, wcsRow.length / 2);
}
}else {
- ints = Arrays.copyOfRange(wcsRow, wcsRow.length / 2,wcsRow.length-1 );
+ ints = Arrays.copyOfRange(wcsRow, (wcsRow.length+2-1) / 2-1,wcsRow.length-1 );
if (split[4].equals("01")){
- ints = Arrays.copyOfRange(ints, 0, wcsRow.length / 2);
+ ints = Arrays.copyOfRange(ints, 0, ints.length / 2);
}else {
- ints = Arrays.copyOfRange(ints, wcsRow.length / 2,wcsRow.length-1);
+ ints = Arrays.copyOfRange(ints, ints.length / 2-1,ints.length-1);
}
}
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];
}
@@ -275,6 +284,26 @@
}
+ public static CrnSlave.CrnStn getCrnStnByStaNo(Integer staNo, Boolean pakIn) {
+ SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ List<CrnSlave.CrnStn> crnInStn = null;
+ if (pakIn) {
+ crnInStn = crn.getCrnInStn();
+ }else {
+ crnInStn = crn.getCrnOutStn();
+ }
+
+ for (CrnSlave.CrnStn crnStn : crnInStn) {
+ if (crnStn.getStaNo().equals(staNo)) {
+ return crnStn;
+ }
+ }
+ }
+
+ return null;
+ }
+
public static void main(String[] args) {
// SlaveProperties slaveProperties = new SlaveProperties();
// slaveProperties.setDoubleDeep(true);
@@ -284,7 +313,7 @@
// slaveProperties.setGroupCount(4);
// Integer deepRow = getDeepRow(slaveProperties, 6);
// System.out.println(deepRow);
- String wcsLocNo = getWcsLocNo("03-52-01-01-02");
+ String wcsLocNo = getWcsLocNo("06-52-01-01-01");
System.out.println(wcsLocNo);
}
}
--
Gitblit v1.9.1