From f278c7fb85663e4fa96534f2c0eafeb612f500bc Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期三, 08 三月 2023 08:04:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 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 8764787..9a1ea8f 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -34,6 +34,11 @@
}
@Override
+ public List<LocMast> queryFreeLocMast2(List<Integer> rows, Integer rowsLen, Short locType1) {
+ return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
+ }
+
+ @Override
public LocMast queryFreeLocMast0(Integer row, Short locType1) {
return this.baseMapper.queryFreeLocMast0(row, locType1);
}
@@ -51,11 +56,11 @@
}
@Override
- public Boolean checkEmptyCount(LocMast locMast) {
+ public Boolean checkEmptyCount(LocMast locMast, int quaOfBlank) {
if (locMast == null) {
return false;
}
- return this.baseMapper.selectEmptyLocCount(locMast.getCrnNo()) > 1;
+ return this.baseMapper.selectEmptyLocCount(locMast.getCrnNo()) > quaOfBlank;
}
@Override
@@ -128,15 +133,7 @@
@Override
public Integer getOutCrnNo(LocMast locMast) {
- int row = Utils.getRow(locMast.getLocNo());
- if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- return 1;
- }
- if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
- return 3;
- } else {
- return locMast.getCrnNo();
- }
+ return 1;
}
}
--
Gitblit v1.9.1