From b50a2e2df1c0fab844dc194ae58f01cf906e32b8 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 27 三月 2023 12:12:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 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..1dba6c3 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,47 @@
@Override
public Integer getOutCrnNo(LocMast locMast) {
- int row = Utils.getRow(locMast.getLocNo());
- if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- return 1;
+ return 1;
+ }
+
+ @Override
+ 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);
+ }
}
- if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
- return 3;
- } else {
- return locMast.getCrnNo();
+ return locMast;
+ }
+
+ /**
+ * 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
+ */
+ public static int getRow(String locNo) {
+ if (!Cools.isEmpty(locNo)) {
+ return Integer.parseInt(locNo.substring(0, 2));
}
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+
+ @Override
+ public List<LocMast> selectAllPeakLoc() {
+ return this.baseMapper.selectAllPeakLoc();
+ }
+
+ @Override
+ public Boolean checkAllLocEmpty(List<String> groupOuterLoc) {
+ List<LocMast> result = this.baseMapper.selectAllLocNotEmpty(groupOuterLoc);
+ return result.size() <= 0;
}
}
--
Gitblit v1.9.1