From c7ee9e7a9a0cb96d1c48bf8a8dff061f16e8a29b Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期一, 14 八月 2023 16:06:23 +0800
Subject: [PATCH] #补丁
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 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 9047436..220790b 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -86,6 +86,22 @@
}
return res;
}
+ @Override
+ public Boolean checkEmptyCount0(LocMast locMast, int quaOfBlank) {
+ if (locMast == null) {
+ return false;
+ }
+ Integer nowQua = 0;
+ nowQua = this.baseMapper.selectEmptyLocCount0(locMast.getLocType1(), locMast.getLocType2(), locMast.getCrnNo());
+ if (Cools.isEmpty(nowQua)) {
+ nowQua = 0;
+ }
+ boolean res = nowQua > quaOfBlank;
+ if (!res) {
+ log.warn("{}鍙峰爢鍨涙満搴撲綅涓嶈冻锛屽洜婊炵暀绌哄簱浣峽}涓�,鐩墠绌哄簱浣峽}涓�", locMast.getCrnNo(), quaOfBlank, nowQua);
+ }
+ return res;
+ }
@Override
public Boolean checkWhole(List<LocDetl> locDetls) {
@@ -206,22 +222,30 @@
@Override
public List<LocMast> findOutMast(Short locType1, List<Integer> crnNos) {
+ if (crnNos.size() == 0) {
+ return null;
+ }
return this.baseMapper.findOutMast(locType1, crnNos);
}
@Override
- public LocMast findInEmptyLocMast(Short locType1, List<Integer> rows) {
- return this.baseMapper.findInEmptyLocMast(locType1, rows);
+ public List<LocMast> findInEmptyLocMast(Short locType1, List<Integer> rows, Integer crnNo) {
+ return this.baseMapper.findInEmptyLocMast(locType1, rows, crnNo);
}
@Override
- public List<LocMast> findEmptyLocMastByLocNos(Short locType1, List<String> locNos) {
- return this.baseMapper.findEmptyLocMastByLocNos(locType1, locNos);
+ public List<LocMast> findEmptyLocMastByLocNos(Short locType1, List<String> locNos, Integer crnNo) {
+ return this.baseMapper.findEmptyLocMastByLocNos(locType1, locNos, crnNo);
}
@Override
- public List<LocMast> findEmptyLowFrequencyLocMast(Short locType1) {
- return this.baseMapper.findEmptyLowFrequencyLocMast(locType1);
+ public List<LocMast> findEmptyLowFrequencyLocMast(Short locType1, Integer crnNo) {
+ return this.baseMapper.findEmptyLowFrequencyLocMast(locType1, crnNo);
+ }
+
+ @Override
+ public List<LocMast> findEmptyLocMast(Short locType1, Integer crnNo) {
+ return this.baseMapper.findEmptyLocMast(locType1, crnNo);
}
@Override
--
Gitblit v1.9.1