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/LocMastServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 17 +++++++++--------
src/main/resources/mapper/LocMastMapper.xml | 2 +-
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 2 +-
src/main/java/com/zy/asrs/service/LocMastService.java | 2 +-
5 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index a8b3aa7..09e504a 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -22,7 +22,7 @@
LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1);
- LocMast queryFreeLocMast2(@Param("row") Integer row, @Param("locType1") Short locType1);
+ LocMast queryFreeLocMast2(@Param("row") Integer row, @Param("locType1") Short locType1,@Param("bay") Integer bay);
@Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 2ec98b9..ac6a0e5 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -17,7 +17,7 @@
*/
LocMast queryFreeLocMast(Integer row, Short locType1);
- LocMast queryFreeLocMast2(Integer row, Short locType1);
+ LocMast queryFreeLocMast2(Integer row, Short locType1,Integer bay);
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
* @param sourceLocNo 婧愬簱浣�
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 42634ef..7391d86 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -22,8 +22,8 @@
return this.baseMapper.queryFreeLocMast(row, locType1);
}
@Override
- public LocMast queryFreeLocMast2(Integer row, Short locType1) {
- return this.baseMapper.queryFreeLocMast2(row, locType1);
+ public LocMast queryFreeLocMast2(Integer row, Short locType1,Integer bay) {
+ return this.baseMapper.queryFreeLocMast2(row, locType1,bay);
}
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());
}
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 17f1767..51c2106 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -53,7 +53,7 @@
from asr_loc_mast
where row1=#{row}
and loc_sts='O'
- and row1 != #{row}
+ and bay != #{bay}
<if test="locType1 != null">
and loc_type1 = #{locType1}
</if>
--
Gitblit v1.9.1