From ac0906df88505ec24ee910899a036676823f9d63 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 21 十一月 2023 08:56:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 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..9c6a0b7 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,27 @@
}
return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo());
}
+
+ @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;
+ }
+
+ @Override
+ public LocMast selectByLocNo(String locNo) {
+ return this.baseMapper.selectByLocNo(locNo);
+ }
}
--
Gitblit v1.9.1