From 7b983df0c9fc8b1eb99429dd37699443c62e1d9d Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期四, 02 二月 2023 18:35:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 47c9f4c..c19181d 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -41,12 +41,12 @@
}
@Override
- public List<LocMast> queryFreeLocMastEnd(Integer row){
- return this.baseMapper.queryFreeLocMastEnd(row);
+ public List<LocMast> queryFreeLocMastEnd(Integer row, Short locType1){
+ return this.baseMapper.queryFreeLocMastEnd(row, locType1);
}
@Override
- public List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row){
- return this.baseMapper.queryFreeLocMastEnd0(bay,lev,row);
+ public List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row, Short locType1){
+ return this.baseMapper.queryFreeLocMastEnd0(bay,lev,row, locType1);
}
@Override
--
Gitblit v1.9.1