From c65c2b5254add3b6975365df0be350cc99deae8c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 31 八月 2022 14:59:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 2
src/main/java/com/zy/asrs/utils/Utils.java | 63 +++++++++++++++++++++++++++++++
src/main/java/com/zy/common/service/CommonService.java | 18 --------
3 files changed, 64 insertions(+), 19 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 1f5e6eb..d648afc 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -54,7 +54,7 @@
@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
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 1fc7f04..67f9ef3 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -161,7 +161,7 @@
}
- public static Integer getGroupRow(String locNo, Boolean pakin){
+ public static Integer getOutermostRow(String locNo, Boolean pakin){
int row = getRow(locNo);
switch (row) {
case 1:
@@ -259,6 +259,67 @@
}
}
+ public static List<Integer> getGroupLoc(Integer row){
+ switch (row) {
+ case 1:
+ case 2:
+ case 3:
+ return new ArrayList<Integer>() {{
+ add(1);
+ add(2);
+ add(3);
+ }};
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ return new ArrayList<Integer>() {{
+ add(4);
+ add(5);
+ add(6);
+ add(7);
+ }};
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ return new ArrayList<Integer>() {{
+ add(8);
+ add(9);
+ add(10);
+ add(11);
+ }};
+ case 12:
+ case 13:
+ case 14:
+ return new ArrayList<Integer>() {{
+ add(12);
+ add(13);
+ add(14);
+ }};
+ case 15:
+ case 16:
+ case 17:
+ case 18:
+ return new ArrayList<Integer>() {{
+ add(15);
+ add(16);
+ add(17);
+ add(18);
+ }};
+ case 19:
+ case 20:
+ case 21:
+ return new ArrayList<Integer>() {{
+ add(19);
+ add(20);
+ add(21);
+ }};
+ default:
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+ }
+
public static void main(String[] args) {
SlaveProperties slaveProperties = new SlaveProperties();
slaveProperties.setDoubleDeep(true);
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index d5562b0..356d251 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -243,23 +243,7 @@
// 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
if (locMast == null) {
- List<Integer> rows;
- if (whsType == 2) {
- rows = FIRST_GROUP_ROW_LIST;
- } else if (whsType == 3) {
- rows = SECOND_GROUP_ROW_LIST;
- } else {
- switch (curRow) {
- case 1:
- rows = FIRST_GROUP_ROW_LIST;
- break;
- case 2:
- rows = SECOND_GROUP_ROW_LIST;
- break;
- default:
- throw new CoolException("鍏ュ簱閫昏緫鏁呴殰銆�" + curRow + "銆�");
- }
- }
+ List<Integer> rows = Utils.getGroupLoc(curRow);
locMast = locMastService.queryFreeLocMast(null, rows, locTypeDto.getLocType1());
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
--
Gitblit v1.9.1