From 57be2fdc0ada5007abf4eb3f99b8ed21b51aecc7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 31 八月 2022 15:43:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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..d648afc 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -8,10 +8,10 @@
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.RowLastnoService;
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.List;
import java.util.stream.Collectors;
@@ -54,15 +54,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) {
--
Gitblit v1.9.1