From cfbba7b9028dbc5871acd5481a319c82fbf1bde1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 03 六月 2023 10:57:29 +0800
Subject: [PATCH] 库位地图优化
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
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 6294b1e..b63a392 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -34,8 +34,8 @@
}
@Override
- public List<LocMast> queryFreeLocMast2(List<Integer> rows, Integer rowsLen, Short locType1) {
- return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
+ public List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd) {
+ return this.baseMapper.queryFreeLocMast2(locType1, rowBeg, rowEnd, bayBeg, bayEnd, levBeg, levEnd);
}
@Override
@@ -84,7 +84,7 @@
int row = Utils.getRow(locNo);
List<String> locNos = Utils.getGroupLoc(locNo);
if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
+ } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row) || CommonService.THIRD_GROUP_ROW_LIST.contains(row)) {
Collections.reverse(locNos);
} else {
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
@@ -94,6 +94,10 @@
LocMast finalRes = null;
for (String locNo0 : locNos) {
LocMast locMast = this.selectById(locNo0);
+ if (locMast == null) {
+ continue;
+ }
+
if (locMast.getLocSts().equals("O")) {
if (finalRes == null) {
finalRes = locMast;
@@ -180,4 +184,9 @@
public List<LocMast> selectLocByLev(Integer lev) {
return this.baseMapper.selectLocByLev(lev);
}
+
+ @Override
+ public List<LocMast> selectEmptyByLocNos(List<String> locNos) {
+ return this.baseMapper.selectEmptyByLocNos(locNos);
+ }
}
--
Gitblit v1.9.1