From f35ed4cfcdf2ebd1f160d159cf8a2147cabc3923 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 24 十月 2022 11:15:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 94 +++++++++++++++++++---------------------------
1 files changed, 39 insertions(+), 55 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 8482b74..a46a44a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -1,5 +1,6 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.LocDetl;
@@ -9,14 +10,13 @@
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.Collections;
import java.util.Iterator;
import java.util.List;
-import java.util.stream.Collectors;
@Service("locMastService")
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
@@ -29,6 +29,11 @@
@Override
public List<LocMast> queryFreeLocMast(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);
}
@Override
@@ -58,63 +63,40 @@
@Override
public Boolean isOutMost(String locNo, Boolean pakin) {
- return Integer.parseInt(locNo.substring(0, 2)) == Utils.getOutermostRow(locNo, true);
+ return Integer.parseInt(locNo.substring(0, 2)) == Utils.getOutLayerRow(locNo, true);
+ }
+
+ public static void main(String[] args) {
+ List<String> groupLoc = Utils.getGroupLoc("2300101");
+ Collections.reverse(groupLoc);
+ System.out.println(JSON.toJSONString(groupLoc));
}
@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);}})) {
- locNos.sort(Comparator.comparingInt(o -> Integer.parseInt(o.substring(0, 2))));
+ public LocMast findOutMost(String locNo) {
+ int row = Utils.getRow(locNo);
+ List<String> locNos = Utils.getGroupLoc(locNo);
+ if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
+ } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
+ Collections.reverse(locNos);
} else {
- rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
- 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);
+ 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("S") || lastLoc.getLocSts().equals("X")) {
+ return locMast;
+ } else {
+ break;
+ }
+ }
}
}
return null;
@@ -127,8 +109,10 @@
while (iterator.hasNext()) {
String next = iterator.next();
LocMast locMast = this.selectById(next);
- if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") || excludeLocNos.contains(locMast.getLocNo())) {
- continue;
+ if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")) {
+ if (!excludeLocNos.contains(locMast.getLocNo())) {
+ continue;
+ }
}
iterator.remove();
}
--
Gitblit v1.9.1