From 4901728f970314cddd9fa167cf3d3fb9476208e5 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 08:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxjzasrs' into sxjzasrs
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 16 ++++++++++++++++
1 files changed, 16 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 12cd14e..b0a6b47 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -18,6 +18,11 @@
private RowLastnoService rowLastnoService;
@Override
+ public List<Integer> queryDistinctRow(Integer crnNo) {
+ return this.baseMapper.queryDistinctRow(crnNo);
+ }
+
+ @Override
public LocMast queryFreeLocMast(Integer row, Short locType1, Short locType2, Short locType3) {
return this.baseMapper.queryFreeLocMast(row, locType1, locType2, locType3);
}
@@ -42,4 +47,15 @@
return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getLocType2(), locMast.getLocType3(), locMast.getCrnNo()) > 1;
}
+ @Override
+ public LocMast queryFreeLocMastIncludeFirst(Integer row, Short locType1, Short locType2, Short locType3) {
+
+ return this.baseMapper.queryFreeLocMastIncludeFirst(row, locType1, locType2, locType3);
+ }
+
+ @Override
+ public LocMast queryFreeLocMastExceptFirst(Integer row, Short locType1, Short locType2, Short locType3) {
+ return this.baseMapper.queryFreeLocMastExceptFirst(row, locType1, locType2, locType3);
+ }
+
}
--
Gitblit v1.9.1