From 3ada754b60571bfa156c2e61df8ddea7ccc496fb Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 09 九月 2023 14:13:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 24 +++++
src/main/java/com/zy/asrs/utils/Utils.java | 112 ---------------------------
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 12 +-
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 38 +--------
src/main/java/com/zy/common/service/CommonService.java | 6
5 files changed, 39 insertions(+), 153 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 a17dc7e..acd2d53 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -15,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -70,7 +71,28 @@
@Override
public Boolean isOutMost(String locNo, Boolean pakin) {
- return Integer.parseInt(locNo.substring(0, 2)) == Utils.getOutLayerRow(locNo, pakin);
+ int row = Utils.getRow(locNo);
+ int bay = Utils.getBay(locNo);
+ ArrayList<Integer> list = new ArrayList<Integer>(){{
+ add(1);add(3);add(4);add(6);
+ add(8);add(10);add(11);
+ }};
+
+ if (list.contains(row)) {
+ return true;//鏈�澶栦晶搴撲綅
+ }
+
+ if (row == 13 && (bay >= 59 && bay <= 61)) {
+ return true;//鏈�澶栦晶搴撲綅
+ }
+
+ if (bay < 59) {
+ if (row == 13 || row == 14 || row == 16) {
+ return true;//鏈�澶栦晶搴撲綅
+ }
+ }
+
+ return false;//涓嶆槸鏈�澶栦晶搴撲綅
}
public static void main(String[] args) {
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index ced2c4c..d5b8dd5 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -190,9 +190,9 @@
}
}
- List<String> groupInsideLoc = Utils.getGroupInsideLoc(locNo);
- if (!Cools.isEmpty(groupInsideLoc)) {
- for (String insideLoc : groupInsideLoc) {
+ List<String> groupInnerLoc = Utils.getGroupInnerLoc(locNo);
+ if (!Cools.isEmpty(groupInnerLoc)) {
+ for (String insideLoc : groupInnerLoc) {
if (locNos.contains(insideLoc)){
continue;
}
@@ -554,9 +554,9 @@
if (sign){
break;
}
- List<String> groupInsideLoc = Utils.getGroupInsideLoc(locNo);
- if (!Cools.isEmpty(groupInsideLoc)) {
- for (String insideLoc : groupInsideLoc) {
+ List<String> groupInnerLoc = Utils.getGroupInnerLoc(locNo);
+ if (!Cools.isEmpty(groupInnerLoc)) {
+ for (String insideLoc : groupInnerLoc) {
if (locNos.contains(insideLoc)){
continue;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 9c72ba2..4633630 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -49,55 +49,29 @@
if (ioType != 11) {
// 鍏ュ簱
if (ioType < 100) {
- List<String> groupOuterLoc = Utils.getGroupOuterLocIoPri(locNo);
- if (!Cools.isEmpty(groupOuterLoc)) {
- for (String outerLoc : groupOuterLoc) {
- WrkMast wrkMast = this.baseMapper.selectByLocNoOfPakin(outerLoc);
+ List<String> groupInnerLoc = Utils.getGroupInnerLoc(locNo);
+ if (!Cools.isEmpty(groupInnerLoc)) {
+ for (String innerLoc : groupInnerLoc) {
+ WrkMast wrkMast = this.baseMapper.selectByLocNoOfPakin(innerLoc);
if (wrkMast != null) {
defaultIoPri = wrkMast.getIoPri() - 2;
-// defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() - 2 : defaultIoPri - 2;
- }
- }
- }
- List<String> groupInsideLoc = Utils.getGroupInsideLoc(locNo);
- if (!Cools.isEmpty(groupInsideLoc)) {
- for (String insideLoc : groupInsideLoc) {
- WrkMast wrkMast = this.baseMapper.selectByLocNoOfPakin(insideLoc);
- if (wrkMast != null) {
- defaultIoPri = wrkMast.getIoPri() + 2;
-// defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() + 2 : defaultIoPri + 2;
}
}
}
// 鍑哄簱
} else {
- List<String> groupOuterLoc = Utils.getGroupInsideLoc(locNo);
+ List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
if (!Cools.isEmpty(groupOuterLoc)) {
for (String outerLoc : groupOuterLoc) {
WrkMast wrkMast = this.baseMapper.selectBySourceLocNoOfPakout(outerLoc);
if (wrkMast != null) {
defaultIoPri = wrkMast.getIoPri() - 2;
- break;
-// defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() - 2 : defaultIoPri - 2;
- }
- }
- }
- List<String> groupInsideLoc = Utils.getGroupOuterLocIoPri(locNo);
- if (!Cools.isEmpty(groupInsideLoc)) {
- for (String insideLoc : groupInsideLoc) {
- WrkMast wrkMast = this.baseMapper.selectBySourceLocNoOfPakout(insideLoc);
- if (wrkMast != null) {
- defaultIoPri = wrkMast.getIoPri() + 2;
-// defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() + 2 : defaultIoPri + 2;
}
}
}
}
- // 绉诲簱
- } else {
-// @Deprecated
}
- return defaultIoPri == null ? 300.0D : defaultIoPri;
+ return defaultIoPri == null ? 100.0D : defaultIoPri;
}
@Override
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 4557c58..7ef96f8 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -181,17 +181,6 @@
return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
}
- public static Integer getOutLayerRow(String locNo, Boolean pakin){
- int row = getRow(locNo);
- if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- return 4;
- } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
- return 5;
- } else {
- return -1;
- }
- }
-
/**
* 鑾峰彇搴撲綅缁�
* @param locNo 搴撲綅鍙�
@@ -259,7 +248,7 @@
}
public static void main(String[] args) {
- System.out.println(JSON.toJSONString(getGroupInnerLoc("1605909")));
+ System.out.println(JSON.toJSONString(getGroupLoc("0703409")));
}
/**
@@ -358,105 +347,6 @@
return new ArrayList<>();
}
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
- }
-
- // 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜
- public static List<String> getGroupOuterLocIoPri(String locNo){
-// int row = getRow(locNo);
-// List<String> result = new ArrayList<>();
-// if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
-// for (Integer integer : CommonService.FIRST_GROUP_ROW_LIST) {
-// if (integer < row) {
-// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-// } else {
-// break;
-// }
-// }
-// } else if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)){
-// for (Integer integer : CommonService.FIRST_GROUP_ROW_LIST_SHORT) {
-// if (integer < row) {
-// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-// } else {
-// break;
-// }
-// }
-// } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)){
-// for (Integer integer : CommonService.SECOND_GROUP_ROW_LIST) {
-// if (integer < row) {
-// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-// } else {
-// break;
-// }
-// }
-// } else if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)){
-// List<Integer> clone = Arrays.asList(new Integer[CommonService.THIRD_GROUP_ROW_LIST.size()]);
-// Collections.copy(clone, CommonService.THIRD_GROUP_ROW_LIST);
-// Collections.reverse(clone);
-// for (Integer integer : clone) {
-// if (integer > row) {
-// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-// } else {
-// break;
-// }
-// }
-// }
-// return result;
- return null;
- }
-
- // 鍐呬晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜 ===>> 鍙嶄箣
- public static List<String> getGroupInsideLoc(String locNo){
-// int row = getRow(locNo);
-// List<String> result = new ArrayList<>();
-// if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
-// List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST.size()]);
-// Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST);
-// Collections.reverse(clone);
-// for (Integer integer : clone) {
-// if (integer > row) {
-// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-// } else {
-// break;
-// }
-// }
-// } else if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)) {
-// List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST_SHORT.size()]);
-// Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST_SHORT);
-// Collections.reverse(clone);
-// for (Integer integer : clone) {
-// if (integer > row) {
-// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-// } else {
-// break;
-// }
-// }
-// } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
-// List<Integer> clone = Arrays.asList(new Integer[CommonService.SECOND_GROUP_ROW_LIST.size()]);
-// Collections.copy(clone, CommonService.SECOND_GROUP_ROW_LIST);
-// Collections.reverse(clone);
-// for (Integer integer : clone) {
-// if (integer > row) {
-// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-// } else {
-// break;
-// }
-// }
-// } else if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)) {
-// for (Integer integer : CommonService.THIRD_GROUP_ROW_LIST) {
-// if (integer < row) {
-// result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-// } else {
-// break;
-// }
-// }
-// } else {
-//// throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
-// }
-// if (!Cools.isEmpty(result)) {
-// Collections.reverse(result);
-// }
-// return result;
- return null;
}
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index af0d55d..83b24d0 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -344,9 +344,9 @@
// 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
List<LocMast> peakLocs = locMastService.selectAllPeakLoc();
for (LocMast peakLoc : peakLocs) {
- List<String> groupInsideLoc = Utils.getGroupInsideLoc(peakLoc.getLocNo());
- if (!Cools.isEmpty(groupInsideLoc)) {
- if (!locMastService.checkAllLocEmpty(groupInsideLoc)) continue;
+ List<String> groupInnerLoc = Utils.getGroupInnerLoc(peakLoc.getLocNo());
+ if (!Cools.isEmpty(groupInnerLoc)) {
+ if (!locMastService.checkAllLocEmpty(groupInnerLoc)) continue;
locMast = peakLoc;
break;
} else {
--
Gitblit v1.9.1