From 1de6f17f5cfeeb66205ffadd3b1ed68d40c62581 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 06 六月 2025 10:44:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 1b71caa..0970a17 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -122,7 +122,8 @@
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 shallowRow = remainder == 1 ? (row + 1) : (row - 1);
+ int shallowRow = row;
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
@@ -141,13 +142,14 @@
int row = getRow(shallowLoc);
int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
int targetRow;
- if (remainder == 2) {
- targetRow = row - 1;
- } else if (remainder == 3) {
- targetRow = row + 1;
- } else {
- throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
- }
+// if (remainder == 2) {
+// targetRow = row - 1;
+// } else if (remainder == 3) {
+// targetRow = row + 1;
+// } else {
+// throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
+// }
+ targetRow = row;
return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
}
@@ -241,7 +243,7 @@
}
public static boolean BooleanWhsTypeStaIoType(Integer whsType) { //鏌ヨ鐩镐技鐗╂枡寮�鍏�
- if (whsType == 1 || whsType==3 || whsType==4) {
+ if (whsType == 1 ||whsType==2 || whsType==3 || whsType==4) {
return true;
}
return false;
@@ -279,7 +281,7 @@
//搴撲綅鎺掑彿鍒嗛厤
public static int[] LocNecessaryParameters(Integer whsType, Integer curRow, Integer crnNumber) {
- switch (whsType){
+ switch (2){
case 1://缁忓吀鍙屼几搴撲綅
return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber); //宸插畬鍠�
case 2://缁忓吀鍗曚几搴撲綅锛�2鎺掕揣鏋讹級
@@ -395,6 +397,7 @@
RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
RowLastno rowLastno = rowLastnoService.selectById(whsType);
Integer sRow = rowLastno.getsRow();
+ Integer eRow = rowLastno.geteRow();
Integer sCrnNo = rowLastno.getsCrnNo();
// 鍒ゆ柇浠撳簱绫诲瀷鏄惁婊¤冻瑕佹眰
@@ -403,7 +406,7 @@
// 璁＄畻鏈�娣卞簱浣嶆帓鍜屾渶娴呭簱浣嶆帓
int minRow = sRow; // 璧峰鎺掑彿
- int maxRow = sRow + 7; // 缁堟鎺掑彿 (8鎺�)
+ int maxRow = eRow; //
// 妫�鏌ユ帓鍙疯寖鍥存槸鍚﹀悎娉�
if (curRow < minRow || curRow > maxRow) {
--
Gitblit v1.9.1