From d8282bc83c48030c3338ce014a88574d1bbfe895 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期六, 29 三月 2025 16:50:59 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 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 0212b4d..376cb17 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -76,10 +76,27 @@
@Override
public Boolean checkEmptyCount(LocMast locMast, int quaOfBlank) {
+// quaOfBlank = 0;
if (locMast == null) {
return false;
}
Integer nowQua = this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getLocType2(), locMast.getCrnNo());
+ boolean res = nowQua > quaOfBlank;
+ if (!res) {
+ log.warn("{}鍙峰爢鍨涙満搴撲綅涓嶈冻锛屽洜婊炵暀绌哄簱浣峽}涓�,鐩墠绌哄簱浣峽}涓�", locMast.getCrnNo(), quaOfBlank, nowQua);
+ }
+ 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);
@@ -206,6 +223,9 @@
@Override
public List<LocMast> findOutMast(Short locType1, List<Integer> crnNos) {
+ if (crnNos.size() == 0) {
+ return null;
+ }
return this.baseMapper.findOutMast(locType1, crnNos);
}
@@ -215,6 +235,11 @@
}
@Override
+ public List<LocMast> findInEmptyLocMastNew(Short locType1, List<String> locNos, Integer crnNo) {
+ return this.baseMapper.findInEmptyLocMastNew(locType1, locNos, crnNo);
+ }
+
+ @Override
public List<LocMast> findEmptyLocMastByLocNos(Short locType1, List<String> locNos, Integer crnNo) {
return this.baseMapper.findEmptyLocMastByLocNos(locType1, locNos, crnNo);
}
--
Gitblit v1.9.1