From e72f4946b1696a570022d6ae715fa07656ab89f7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 27 九月 2023 13:07:43 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 35 +++++++++++------------------------
1 files changed, 11 insertions(+), 24 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 acd2d53..1c44970 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -30,18 +30,13 @@
private WorkService workService;
@Override
- public List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1) {
- return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
- }
-
- @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);
}
@Override
- public LocMast queryFreeLocMast0(Integer row, Short locType1) {
- return this.baseMapper.queryFreeLocMast0(row, locType1);
+ public List<LocMast> selectAreaEmpty(Short locType1, Integer locType3) {
+ return this.baseMapper.selectAreaEmpty(locType1, locType3);
}
@Override
@@ -61,12 +56,7 @@
if (locMast == null) {
return false;
}
- return this.baseMapper.selectEmptyLocCount(locMast.getCrnNo()) > quaOfBlank;
- }
-
- @Override
- public Boolean checkWhole(List<LocDetl> locDetls) {
- return null;
+ return this.baseMapper.selectEmptyLocCount(locMast.getLocType3(), locMast.getLev1()) > quaOfBlank;
}
@Override
@@ -149,17 +139,9 @@
public LocMast findNearloc(String locNo) {
int row = getRow(locNo);
LocMast locMast = null;
- if (row>19) {
- List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
- if (!Cools.isEmpty(groupOuterLoc)) {
- locMast = this.baseMapper.selectAvailableNearLocDesc(groupOuterLoc);
- }
-
- }else {
- List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
- if (!Cools.isEmpty(groupOuterLoc)) {
- locMast = this.baseMapper.selectAvailableNearLocAsc(groupOuterLoc);
- }
+ List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
+ if (!Cools.isEmpty(groupOuterLoc)) {
+ locMast = this.baseMapper.selectAvailableNearLocAsc(groupOuterLoc);
}
return locMast;
}
@@ -196,6 +178,11 @@
}
@Override
+ public LocMast selectByLoc(String locNo) {
+ return this.baseMapper.selectByLoc(locNo);
+ }
+
+ @Override
public Integer updateLocType2ByRBL(Integer locType2, Integer startRow, Integer endRow, Integer startBay, Integer endBay, Integer startLev, Integer endLev) {
return this.baseMapper.updateLocType2ByRBL(locType2, startRow, endRow, startBay, endBay, startLev, endLev);
}
--
Gitblit v1.9.1