From 4f4559efbe2d2f20f2c37d8582b74f0a558a54c7 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期一, 30 一月 2023 22:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 5ba6512..47c9f4c 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -31,8 +31,22 @@
return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
}
@Override
- public List<LocMast> queryFreeLocMast2(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday) {
- return this.baseMapper.queryFreeLocMast2(rows, rowsLen, locType1,inoutEveryday);
+ public List<LocMast> queryFreeLocMast0(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday) {
+ return this.baseMapper.queryFreeLocMast0(rows, rowsLen, locType1,inoutEveryday);
+ }
+
+ @Override
+ public List<LocMast> queryFreeLocMast1(List<Integer> rows, Integer rowsLen, Short locType1, Boolean inoutEveryday, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd) {
+ return this.baseMapper.queryFreeLocMast1(rows, rowsLen, locType1,inoutEveryday, rowBeg, rowEnd, bayBeg, bayEnd, levBeg, levEnd);
+ }
+
+ @Override
+ public List<LocMast> queryFreeLocMastEnd(Integer row){
+ return this.baseMapper.queryFreeLocMastEnd(row);
+ }
+ @Override
+ public List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row){
+ return this.baseMapper.queryFreeLocMastEnd0(bay,lev,row);
}
@Override
--
Gitblit v1.9.1