From b6b46e1c4d390c80cf9bd7d4daa23202f2d11a22 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 13:47:57 +0800
Subject: [PATCH] 站点管理编辑高低库位
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 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 0591fa4..ba49674 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);
}
@@ -74,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;
}
@@ -152,6 +158,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;
@@ -194,4 +204,33 @@
this.baseMapper.updateLocSts(locNo,locSts);
}
+ @Override
+ public List<LocMast> findOutMast(Short locType1, List<Integer> crnNos) {
+ return this.baseMapper.findOutMast(locType1, crnNos);
+ }
+
+ @Override
+ public LocMast findInEmptyLocMast(Short locType1, List<Integer> rows) {
+ return this.baseMapper.findInEmptyLocMast(locType1, rows);
+ }
+
+ @Override
+ public List<LocMast> findEmptyLocMastByLocNos(Short locType1, List<String> locNos) {
+ return this.baseMapper.findEmptyLocMastByLocNos(locType1, locNos);
+ }
+
+ @Override
+ public List<LocMast> findEmptyLowFrequencyLocMast(Short locType1) {
+ return this.baseMapper.findEmptyLowFrequencyLocMast(locType1);
+ }
+
+ @Override
+ public List<LocMast> selectLocByLev(Integer lev) {
+ return this.baseMapper.selectLocByLev(lev);
+ }
+
+ @Override
+ public List<LocMast> selectByLocNos(List<String> locNos) {
+ return this.baseMapper.selectByLocNos(locNos);
+ }
}
--
Gitblit v1.9.1