From f36b01fcf99f5ef0a1500d155c309ccbc7a20250 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 06 四月 2026 14:38:11 +0800
Subject: [PATCH] 高库位收到locType1=3调整
---
src/main/java/com/zy/asrs/utils/Utils.java | 67 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 8bfd23c..91537d3 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -45,10 +45,10 @@
return (float) Arith.multiplys(2, f, 1);
}
- public static int armStaNo(int armNo,int staNo) {
- switch (armNo){
+ public static int armStaNo(int armNo, int staNo) {
+ switch (armNo) {
case 1:
- switch (staNo){
+ switch (staNo) {
case 0:
return 7;
case 1:
@@ -61,7 +61,7 @@
return 0;
}
case 2:
- switch (staNo){
+ switch (staNo) {
case 0:
return 5;
case 1:
@@ -74,7 +74,7 @@
return 0;
}
case 3:
- switch (staNo){
+ switch (staNo) {
case 0:
return 3;
case 1:
@@ -87,7 +87,7 @@
return 0;
}
case 4:
- switch (staNo){
+ switch (staNo) {
case 0:
return 1;
case 1:
@@ -100,7 +100,7 @@
return 0;
}
case 5:
- switch (staNo){
+ switch (staNo) {
case 0:
return 11;
case 1:
@@ -113,7 +113,7 @@
return 0;
}
case 6:
- switch (staNo){
+ switch (staNo) {
case 0:
return 13;
case 1:
@@ -159,8 +159,8 @@
* {@code {crnNo: 鍫嗗灈鏈哄彿, locType1: 搴撲綅楂樹綆绫诲瀷}}
*
* @param stationId 鍏ュ簱绔欑偣
- * @param locType1 鐩爣搴撲綅楂樹綆绫诲瀷锛�1=浣庡簱浣嶏紝2=楂樺簱浣�
- * @param matnr 鐗╂枡缂栫爜锛屼紶鍏� {@code emptyPallet} 鏃朵娇鐢ㄧ┖鏉挎帓搴忚鍒�
+ * @param locType1 鐩爣搴撲綅楂樹綆绫诲瀷锛�1=浣庡簱浣嶏紝2=楂樺簱浣�
+ * @param matnr 鐗╂枡缂栫爜锛屼紶鍏� {@code emptyPallet} 鏃朵娇鐢ㄧ┖鏉挎帓搴忚鍒�
* @return 鎸変紭鍏堢骇鎺掑ソ搴忕殑鍫嗗灈鏈哄垪琛�
*/
public static List<Map<String, Integer>> getStationStorageAreaName(Integer stationId, Integer locType1, String matnr) {
@@ -188,6 +188,7 @@
return result;
}
+
private static void appendCrnLocTypeEntries(List<Map<String, Integer>> result, List<Integer> crnNos, Integer locType1, boolean emptyPallet, LocMastService locMastService) {
Short normalizedLocType1 = normalizeLocType1(locType1);
if (normalizedLocType1 == null) {
@@ -233,7 +234,7 @@
}
private static List<Integer> getAvailableCrnNos(List<Integer> candidateCrnNos, Integer locType1, boolean emptyPallet,
- BasCrnpService basCrnpService, LocMastService locMastService) {
+ BasCrnpService basCrnpService, LocMastService locMastService) {
LinkedHashSet<Integer> availableCrnNos = new LinkedHashSet<>();
if (Cools.isEmpty(candidateCrnNos)) {
return new ArrayList<>();
@@ -296,6 +297,8 @@
private static Short normalizeLocType1(Integer locType1) {
if (locType1 == null || (locType1 != 1 && locType1 != 2)) {
return null;
+ } else {
+ locType1 = 2;
}
return locType1.shortValue();
}
@@ -542,6 +545,7 @@
return null;
}
}
+
private static Integer parseStorageArea(String area) {
if (Cools.isEmpty(area)) {
return null;
@@ -567,6 +571,7 @@
}
return null;
}
+
public static String zerofill(String msg, Integer count) {
if (msg.length() == count) {
return msg;
@@ -681,8 +686,8 @@
*/
public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
int row = getRow(shallowLoc);
- boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);
- boolean deepLocRight = isDeepLocRight(slaveProperties, row+1);
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, row - 1);
+ boolean deepLocRight = isDeepLocRight(slaveProperties, row + 1);
int targetRow;
if (deepLocLeft) {
targetRow = row - 1;
@@ -711,8 +716,8 @@
* 鑾峰彇 娴呭簱浣嶆帓瀵瑰簲鐨勬繁搴撲綅鎺�
*/
public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
- boolean deepLocLeft = isDeepLocLeft(slaveProperties, shallowRow-1);
- boolean deepLocRight = isDeepLocRight(slaveProperties, shallowRow+1);
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, shallowRow - 1);
+ boolean deepLocRight = isDeepLocRight(slaveProperties, shallowRow + 1);
int targetRow;
if (deepLocLeft) {
targetRow = shallowRow - 1;
@@ -870,13 +875,13 @@
if (curRow < sRow || curRow > (crnNumber * 4 + sRow - 1)) {
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
- if ((curRow - (sRow-1)) % 4 == 0) {
+ if ((curRow - (sRow - 1)) % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - (sRow-1)) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[2] = (curRow - (sRow - 1)) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if ((curRow - (sRow-1)-1) % 4 == 0) {
+ } else if ((curRow - (sRow - 1) - 1) % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - (sRow-1)-1) / 4 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[2] = (curRow - (sRow - 1) - 1) / 4 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
} else {
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
@@ -1044,6 +1049,7 @@
return necessaryParameters;
}
+
//鍥涘悜搴擄紙鐗涚溂\鍏夋嘲锛�
public static int[] LocNecessaryParametersDoubleExtension6(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
@@ -1053,7 +1059,7 @@
necessaryParameters[0] = crnNumber; // 杞娆℃暟
curRow = curRow - offset;
//婊℃澘姝ｅ父鍏ュ簱
- switch (curRow){
+ switch (curRow) {
case 1:
necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
@@ -1099,7 +1105,7 @@
Integer sCrnNo = rowLastno.getsCrnNo();//璧峰鍫嗗灈鏈哄彿
necessaryParameters[0] = crnNumber; // 杞娆℃暟
//婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(rowLastno.geteRow())){
+ if (curRow.equals(rowLastno.geteRow())) {
necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
@@ -1174,22 +1180,23 @@
// 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜 ===>> 鍙嶄箣
public static List<String> getGroupOutLocCrn(Integer curRow, Integer nearRow, String locNo, boolean pakin) {
List<String> result = new ArrayList<>();
- if (pakin){
- for (int row = curRow;row>=nearRow;row--){
+ if (pakin) {
+ for (int row = curRow; row >= nearRow; row--) {
result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2));
}
- }else {
- for (int row = curRow;row<=nearRow;row++){
+ } else {
+ for (int row = curRow; row <= nearRow; row++) {
result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2));
}
}
return result;
}
+
//erp搴綅杞夋彌
public static String ERPLocToWMSLoc(String locNo) {
String WmsLoc = locNo.substring(1);
String[] split = locNo.split("-");
- WmsLoc = split[0].substring(1)+split[1]+split[2];
+ WmsLoc = split[0].substring(1) + split[1] + split[2];
return WmsLoc;
}
@@ -1201,7 +1208,7 @@
for (char c : row.toCharArray()) {
if (c == '0') {
i++;
- }else {
+ } else {
break;
}
}
@@ -1211,7 +1218,7 @@
for (char c : boy.toCharArray()) {
if (c == '0') {
j++;
- }else {
+ } else {
break;
}
}
@@ -1221,14 +1228,14 @@
for (char c : lev.toCharArray()) {
if (c == '0') {
k++;
- }else {
+ } else {
break;
}
}
lev = lev.substring(k);
return row + "-" + boy + "-" + lev;
}
-
+
}
--
Gitblit v1.9.1