From f513af7c0a8c334ca73c540afd443c821bbc6a54 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 26 九月 2025 15:19:44 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 81a9da5..e13d542 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2661,13 +2661,14 @@
LocMast loc = null;
for (Integer row : rows) {
if (Utils.isDeepLoc(slaveProperties, row)) {
- if (shallowLoc.getRow1() == 1 && row == 1) {
- loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1());
- } else if (shallowLoc.getRow1() == 29 && row == 29) {
- loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1());
+ if (shallowLoc.getBay1() == 1) {
+ loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 1);
+ } else if (shallowLoc.getRow1() == 29) {
+ loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 29);
} else {
loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
}
+
if (loc != null) {
if (Utils.isDeepLoc(slaveProperties, loc.getLocNo())) {
@@ -2686,10 +2687,10 @@
if (null == loc) {
for (Integer row : rows) {
if (Utils.isShallowLoc(slaveProperties, row)) {
- if (shallowLoc.getRow1() == 1 && row == 1) {
- loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1());
- } else if (shallowLoc.getRow1() == 29 && row == 29) {
- loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1());
+ if (shallowLoc.getBay1() == 1) {
+ loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 1);
+ } else if (shallowLoc.getRow1() == 29) {
+ loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 29);
} else {
loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
}
--
Gitblit v1.9.1