From 5fb5b6883895eed6b79a9b20a8bff748134e9cfb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 十二月 2023 12:38:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 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 d2618bc..6d6b86b 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -7,6 +7,7 @@
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.RowLastnoService;
+import com.zy.asrs.utils.Utils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -36,11 +37,11 @@
}
@Override
- public Boolean checkEmptyCount(LocMast locMast) {
+ public Boolean checkEmptyCount(LocMast locMast, int quaOfBlank) {
if (locMast == null) {
return false;
}
- return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
+ return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > quaOfBlank;
}
@Override
@@ -79,12 +80,45 @@
}
+ @Override
+ public LocMast selectByLoc(String locNo) {
+ return this.baseMapper.selectByLoc(locNo);
+ }
+
+ @Override
+ public LocMast findNearloc(String locNo) {
+ LocMast locMast = null;
+ List<String> groupOuterLoc = Utils.getGroupLocNo(locNo, true);
+ if (!Cools.isEmpty(groupOuterLoc)) {
+ for (String loc : groupOuterLoc) {
+ LocMast tmp = this.baseMapper.selectByLoc(loc);
+ if (tmp == null) {
+ continue;
+ }
+
+ if (tmp.getLocSts().equals("O")) {
+ locMast = tmp;
+ break;
+ }
+ }
+ }
+ return locMast;
+ }
@Override
public List<LocMast> selectByLocNo(List<String> locNo) {
return this.baseMapper.selectByLocNo(locNo);
}
+ @Override
+ public List<LocMast> selectAreaEmpty(Short locType1,Integer crnNo) {
+ return this.baseMapper.selectAreaEmpty(locType1,crnNo);
+ }
+ @Override
+ public boolean checkAllLocEmpty(List<String> groupOuterLoc) {
+ List<LocMast> result = this.baseMapper.selectAllLocNotEmpty(groupOuterLoc);
+ return result.size() <= 0;
+ }
}
--
Gitblit v1.9.1