From 392aebed0af81c8369a3f07dfdc53cad1b59f6b4 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 09 三月 2023 16:53:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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 0591fa4..14d108e 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -52,6 +52,11 @@
}
@Override
+ public List<LocMast> queryFreeLocMastEnd1(Integer row, Short locType1,Boolean inoutEveryday){
+ return this.baseMapper.queryFreeLocMastEnd1(row, locType1,inoutEveryday);
+ }
+
+ @Override
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);
}
@@ -152,6 +157,10 @@
LocMast finalRes = null;
for (String locNo : locNos) {
LocMast locMast = this.selectById(locNo);
+ if(locMast == null)
+ {
+ continue;
+ }
if (locMast.getLocSts().equals("O")) {
if (finalRes == null) {
finalRes = locMast;
--
Gitblit v1.9.1