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 | 74 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 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 b311758..220790b 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -52,6 +52,11 @@
}
@Override
+ public List<LocMast> queryFreeLocMastEnd1(Integer row, Short locType1,Boolean inoutEveryday){
+ return this.baseMapper.queryFreeLocMastEnd1(row, locType1,inoutEveryday);
+ }
+
+ @Override
public List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd) {
return this.baseMapper.queryFreeLocMast2(locType1, rowBeg, rowEnd, bayBeg, bayEnd, levBeg, levEnd);
}
@@ -70,11 +75,32 @@
}
@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;
+ 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);
+ }
+ return res;
}
@Override
@@ -148,6 +174,10 @@
LocMast finalRes = null;
for (String locNo : locNos) {
LocMast locMast = this.selectById(locNo);
+ if(locMast == null)
+ {
+ continue;
+ }
if (locMast.getLocSts().equals("O")) {
if (finalRes == null) {
finalRes = locMast;
@@ -190,4 +220,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