From e86c84f673a552f351c6847a5f432910cb927082 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 06 九月 2022 14:06:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 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 b1f2189..740034a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -7,12 +7,14 @@
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.RowLastnoService;
+import com.zy.asrs.service.WorkService;
import com.zy.asrs.utils.Utils;
-import com.zy.common.service.CommonService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.Comparator;
+import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
@@ -21,10 +23,22 @@
@Autowired
private RowLastnoService rowLastnoService;
+ @Autowired
+ private WorkService workService;
@Override
- public LocMast queryFreeLocMast(Integer row, List<Integer> rows, Short locType1) {
- return this.baseMapper.queryFreeLocMast(row, rows, locType1);
+ 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;
}
@Override
@@ -54,15 +68,21 @@
@Override
public Boolean isOutMost(String locNo, Boolean pakin) {
- return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo, true);
+ return Integer.parseInt(locNo.substring(0, 2)) == Utils.getOutermostRow(locNo, true);
}
@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(CommonService.FIRST_GROUP_ROW_LIST)) {
+ 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(CommonService.SECOND_GROUP_ROW_LIST)) {
+ } 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) {
@@ -74,4 +94,19 @@
return null;
}
+ @Override
+ public synchronized void breakUp(String locNo) {
+ 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;
+ }
+ iterator.remove();
+ }
+ workService.shuttleTransfer(groupLoc);
+ }
+
}
--
Gitblit v1.9.1