From 1a56f6f4a0c2b8fc61bfde8bd3418a9731b87647 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 25 十月 2024 12:38:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhtwcs' into tzhtwcs
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 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 e1a01ea..e6eedce 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,13 @@
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
@Override
- public LocMast queryFreeLocMast(Integer row) {
- return this.baseMapper.queryFreeLocMast(row);
+ 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
@@ -28,4 +33,28 @@
}
return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo());
}
+
+ @Override
+ public LocMast queryDemoSourceLoc0(Integer crn) {
+ return this.baseMapper.queryDemoSourceLoc(crn);
+ }
+
+ @Override
+ public LocMast queryDemoSourceLoc(Integer crn) {
+ return this.baseMapper.queryDemoSourceLoc(crn);
+ }
+
+ @Override
+ public LocMast queryDemoLoc(Integer crn) {
+ 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