From a6ae5a74d1de3db517526a3ba5db1e4a2a68cf65 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 24 十月 2024 08:49:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtwcs' into ghjtwcs
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 18 ++++++++++++++++++
1 files changed, 18 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 6e39d53..59f47d8 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -13,8 +13,18 @@
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
@Override
+ public List<Integer> queryDistinctRow(Integer crnNo) {
+ return this.baseMapper.queryDistinctRow(crnNo);
+ }
+
+ @Override
public LocMast queryFreeLocMast(Integer row, Short locType1) {
return this.baseMapper.queryFreeLocMast(row, locType1);
+ }
+
+ @Override
+ public LocMast queryFreeLocMastNotBay(Integer row, Short locType1, Integer bay) {
+ return this.baseMapper.queryFreeLocMastNotBay(row, locType1,bay);
}
@Override
@@ -39,4 +49,12 @@
return this.baseMapper.queryDemoLoc(crn);
}
+ @Override
+ public Boolean checkEmptyCount(LocMast locMast) {
+ if (locMast == null) {
+ return false;
+ }
+ return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
+ }
+
}
--
Gitblit v1.9.1