From 3863e5a60b1b650d5a2025779edd6a8b557939d8 Mon Sep 17 00:00:00 2001
From: dubin <dubin>
Date: 星期二, 26 八月 2025 17:14:54 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/utils/Utils.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..ea5588f 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;
@@ -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