From d382ffad92c48f6a96bb7d5e1fd733b90c9ca137 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 03 六月 2023 09:50:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 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 14d108e..930a1b0 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -79,9 +79,10 @@
if (locMast == null) {
return false;
}
- boolean res = this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > quaOfBlank;
+ Integer nowQua = this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getLocType2(), locMast.getCrnNo());
+ boolean res = nowQua > quaOfBlank;
if (!res) {
- log.warn("{}鍙峰爢鍨涙満搴撲綅涓嶈冻锛屽洜婊炵暀绌哄簱浣峽}涓�", locMast.getCrnNo(), quaOfBlank);
+ log.warn("{}鍙峰爢鍨涙満搴撲綅涓嶈冻锛屽洜婊炵暀绌哄簱浣峽}涓�,鐩墠绌哄簱浣峽}涓�", locMast.getCrnNo(), quaOfBlank, nowQua);
}
return res;
}
@@ -203,4 +204,44 @@
this.baseMapper.updateLocSts(locNo,locSts);
}
+ @Override
+ public List<LocMast> findOutMast(Short locType1, List<Integer> crnNos) {
+ if (crnNos.size() == 0) {
+ return null;
+ }
+ return this.baseMapper.findOutMast(locType1, crnNos);
+ }
+
+ @Override
+ 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, Integer crnNo) {
+ return this.baseMapper.findEmptyLocMastByLocNos(locType1, locNos, crnNo);
+ }
+
+ @Override
+ 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
+ public List<LocMast> selectLocByLev(Integer lev) {
+ return this.baseMapper.selectLocByLev(lev);
+ }
+
+ @Override
+ public List<LocMast> selectByLocNos(List<String> locNos) {
+ if (locNos == null || locNos.size() == 0) {
+ return new ArrayList<LocMast>();
+ }
+ return this.baseMapper.selectByLocNos(locNos);
+ }
}
--
Gitblit v1.9.1