From 6819d4bdc59a0146dc4e4fa5a25b0eddacea2747 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 25 十月 2022 14:05:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 62 +++++++++++++-----------------
1 files changed, 27 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index f463cff..5d29d14 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -2,7 +2,6 @@
import com.core.common.Arith;
import com.core.common.Cools;
-import com.zy.core.enums.SteABType;
import com.zy.core.properties.SlaveProperties;
import java.text.DecimalFormat;
@@ -13,6 +12,15 @@
* Created by vincent on 2020/8/27
*/
public class Utils {
+
+ public static final List<Integer> FIRST_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(2);add(3);add(4);add(5);add(6);add(7);add(8);add(9);add(10);
+ add(11);add(12);add(13);add(14);add(15);add(16);add(17);
+ }};
+ public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+ add(18);add(19);add(20);
+ add(21);add(22);add(23);add(24);add(25);add(26);add(27);add(28);add(29);add(30);
+ }};
private static final DecimalFormat fmt = new DecimalFormat("##0.00");
@@ -37,44 +45,28 @@
}
}
- public static Integer getGroupRow(String locNo){
+ public static Integer getGroupRow(String locNo, Boolean pakin){
int row = getRow(locNo);
- return getGroupRow(row);
+ return getGroupRow(row, pakin);
}
- public static Integer getGroupRow(Integer row) {
- switch (row) {
- case 0:
- return 0;
- case 1:
- case 2:
- case 3:
- return 3;
- case 4:
- case 5:
- case 6:
- case 7:
- return 4;
- case 8:
- case 9:
- case 10:
- case 11:
- return 11;
- case 12:
- case 13:
- case 14:
- return 12;
- case 15:
- case 16:
- case 17:
- case 18:
+ public static Integer getGroupRow(Integer row, Boolean pakin) {
+ if (pakin) {
+ if (FIRST_GROUP_ROW_LIST.contains(row)) {
+ return 17;
+ } else if (SECOND_GROUP_ROW_LIST.contains(row)) {
return 18;
- case 19:
- case 20:
- case 21:
- return 19;
- default:
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ } else {
+ return 0;
+ }
+ } else {
+ if (FIRST_GROUP_ROW_LIST.contains(row)) {
+ return 2;
+ } else if (SECOND_GROUP_ROW_LIST.contains(row)) {
+ return 30;
+ } else {
+ return 0;
+ }
}
}
--
Gitblit v1.9.1