From 581de39d6412f674853e8293a92d3d584db7865e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 04 五月 2026 18:17:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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..d103d0e 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);
}
@@ -241,7 +242,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;
@@ -305,11 +306,11 @@
if (BooleanWhsTypeSta(whsType)) {
necessaryParameters[0] = crnNumber; // 杞娆℃暟
//婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(crnNumber * 4 + sRow - 1)) {
+ if (curRow.equals(crnNumber * 4 + sRow - 1) || curRow == crnNumber * 4 + sRow - 1) {
necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) {
+ } else if (curRow.equals((crnNumber - 1) * 4 + sRow) || curRow == (crnNumber - 1) * 4 + sRow) {
necessaryParameters[1] = sRow+3; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = sRow+2; //nearRow 鏈�娴呭簱浣嶆帓
@@ -395,6 +396,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 +405,7 @@
// 璁＄畻鏈�娣卞簱浣嶆帓鍜屾渶娴呭簱浣嶆帓
int minRow = sRow; // 璧峰鎺掑彿
- int maxRow = sRow + 7; // 缁堟鎺掑彿 (8鎺�)
+ int maxRow = eRow; //
// 妫�鏌ユ帓鍙疯寖鍥存槸鍚﹀悎娉�
if (curRow < minRow || curRow > maxRow) {
--
Gitblit v1.9.1