From af17595ea094b162d3b90279f140cbdb3da1c52b Mon Sep 17 00:00:00 2001
From: zwl <zwl123>
Date: 星期六, 07 十月 2023 15:25:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxlktasrs' into sxlktasrs
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 463a59c..7c45eec 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
@@ -39,7 +40,16 @@
if (locMast == null) {
return false;
}
- return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
+ return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 5;
}
+ @Override
+ public Boolean checkWhole(List<LocDetl> locDetls) {
+ return null;
+ }
+
+ @Override
+ public List<LocMast> queryShallowLocFMast(Integer crnNo) {
+ return this.baseMapper.queryShallowLocFMast(crnNo);
+ }
}
--
Gitblit v1.9.1