From b5130c2e6d60c7f23e37f7c620375bc4e253caa3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 18 十月 2022 14:52:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 74 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 23 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 740034a..2b08e21 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -27,18 +27,8 @@
private WorkService workService;
@Override
- public LocMast queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1) {
- List<LocMast> locMasts = this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
- if (Cools.isEmpty(locMasts)) {
- return null;
- }
- Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
- for (LocMast locMast : locMasts) {
- if (locMast.getRow1().equals(innermostRow)) {
- return locMast;
- }
- }
- return null;
+ public List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1) {
+ return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
}
@Override
@@ -74,17 +64,53 @@
@Override
public LocMast findOutMost(List<String> locNos) {
List<Integer> rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
- if (!rows.retainAll(new ArrayList<Integer>() {{ add(1);add(2);add(3);}})
- || !rows.retainAll(new ArrayList<Integer>() {{ add(8);add(9);add(10);add(11);}})
- || !rows.retainAll(new ArrayList<Integer>() {{ add(15);add(16);add(17);add(18);}})
- ) {
+ if (!rows.retainAll(new ArrayList<Integer>() {{ add(1);add(2);add(3);}})) {
locNos.sort(Comparator.comparingInt(o -> Integer.parseInt(o.substring(0, 2))));
- } else if (!rows.retainAll(new ArrayList<Integer>() {{ add(4);add(5);add(6);add(7);}})
- || !rows.retainAll(new ArrayList<Integer>() {{ add(12);add(13);add(14);}})
- || !rows.retainAll(new ArrayList<Integer>() {{ add(19);add(20);add(21);}})
- ) {
- locNos.sort((o1, o2) -> Integer.parseInt(o2.substring(0, 2)) - Integer.parseInt(o1.substring(0, 2)));
+ } else {
+ rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
}
+
+ if (!rows.retainAll(new ArrayList<Integer>() {{ add(8);add(9);add(10);add(11);}})) {
+ locNos.sort(Comparator.comparingInt(o -> Integer.parseInt(o.substring(0, 2))));
+ } else {
+ rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
+ }
+
+ if (!rows.retainAll(new ArrayList<Integer>() {{ add(15);add(16);add(17);add(18);}})) {
+ locNos.sort(Comparator.comparingInt(o -> Integer.parseInt(o.substring(0, 2))));
+ } else {
+ rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
+ }
+
+ if (!rows.retainAll(new ArrayList<Integer>() {{ add(4);add(5);add(6);add(7);}})) {
+ locNos.sort((o1, o2) -> Integer.parseInt(o2.substring(0, 2)) - Integer.parseInt(o1.substring(0, 2)));
+ } else {
+ rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
+ }
+
+ if (!rows.retainAll(new ArrayList<Integer>() {{ add(12);add(13);add(14);}})) {
+ locNos.sort((o1, o2) -> Integer.parseInt(o2.substring(0, 2)) - Integer.parseInt(o1.substring(0, 2)));
+ } else {
+ rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
+ }
+
+ if (!rows.retainAll(new ArrayList<Integer>() {{ add(19);add(20);add(21);}})) {
+ locNos.sort((o1, o2) -> Integer.parseInt(o2.substring(0, 2)) - Integer.parseInt(o1.substring(0, 2)));
+ } else {
+ rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
+ }
+
+// if (!rows.retainAll(new ArrayList<Integer>() {{ add(1);add(2);add(3);}})
+// || !rows.retainAll(new ArrayList<Integer>() {{ add(8);add(9);add(10);add(11);}})
+// || !rows.retainAll(new ArrayList<Integer>() {{ add(15);add(16);add(17);add(18);}})
+// ) {
+// locNos.sort(Comparator.comparingInt(o -> Integer.parseInt(o.substring(0, 2))));
+// } else if (!rows.retainAll(new ArrayList<Integer>() {{ add(4);add(5);add(6);add(7);}})
+// || !rows.retainAll(new ArrayList<Integer>() {{ add(12);add(13);add(14);}})
+// || !rows.retainAll(new ArrayList<Integer>() {{ add(19);add(20);add(21);}})
+// ) {
+// locNos.sort((o1, o2) -> Integer.parseInt(o2.substring(0, 2)) - Integer.parseInt(o1.substring(0, 2)));
+// }
for (String locNo : locNos) {
LocMast locMast = this.selectById(locNo);
if (locMast.getLocSts().equals("O")) {
@@ -95,14 +121,16 @@
}
@Override
- public synchronized void breakUp(String locNo) {
+ public synchronized void breakUp(String locNo, List<String> excludeLocNos) {
List<String> groupLoc = Utils.getGroupOuterLoc(locNo);
Iterator<String> iterator = groupLoc.iterator();
while (iterator.hasNext()) {
String next = iterator.next();
LocMast locMast = this.selectById(next);
if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")) {
- continue;
+ if (!excludeLocNos.contains(locMast.getLocNo())) {
+ continue;
+ }
}
iterator.remove();
}
--
Gitblit v1.9.1