From a9e8a91fd4c8c504d7df9ef921f32d832390e77d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 13:42:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
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..e11951b 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -5,6 +5,7 @@
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -13,8 +14,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 +34,26 @@
}
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 selectztgx(String sts1,String sts2,Integer count){
+ return this.baseMapper.selectztgx(sts1,sts2,count);
+ }
}
--
Gitblit v1.9.1