From ab746e04a079ba979f7caaa2535ffb57ffc9766f Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 15:53:03 +0800
Subject: [PATCH] 地图切换楼层
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 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..ba49674 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,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