From 5492ef73e74bf47d379be9e542ec02c91574a89f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 29 十一月 2022 16:45:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 84 +++++++++++++++++++++++++++++++++++-------
1 files changed, 70 insertions(+), 14 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 7dff5f0..46dda57 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -30,6 +30,10 @@
public List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1) {
return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
}
+ @Override
+ public List<LocMast> queryFreeLocMast0(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday) {
+ return this.baseMapper.queryFreeLocMast0(rows, rowsLen, locType1,inoutEveryday);
+ }
@Override
public List<String> queryGroupEmptyStock(String sourceLocNo) {
@@ -64,39 +68,91 @@
@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());
}
- for (String locNo : locNos) {
- LocMast locMast = this.selectById(locNo);
+
+ 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 (int i = 0; i<locNos.size(); i++) {
+ LocMast locMast = this.selectById(locNos.get(i));
if (locMast.getLocSts().equals("O")) {
- return locMast;
+ if (i == 0) {
+ return locMast;
+ } else {
+ LocMast lastLoc = this.selectById(locNos.get(i - 1));
+ if (lastLoc.getLocSts().equals("F") || lastLoc.getLocSts().equals("D") || lastLoc.getLocSts().equals("X")) {
+ return locMast;
+ } else {
+ break;
+ }
+ }
}
}
return null;
}
@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();
}
workService.shuttleTransfer(groupLoc);
}
+ @Override
+ public void updateLocSts(String locNo, String locSts) {
+ this.baseMapper.updateLocSts(locNo,locSts);
+ }
+
}
--
Gitblit v1.9.1