From d3f11759e6b32d7e9e63e0f7b0cc4b6874aea020 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 11:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/utils/Utils.java | 147 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 141 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 5ded7a4..34f89db 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -6,6 +6,7 @@
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.LocMastService;
import com.zy.common.properties.SlaveProperties;
@@ -405,8 +406,8 @@
}
}
- // 鑾峰彇褰撳墠搴撲綅鍑哄簱鍓嶆柟搴撲綅缁勪笉鍖呭惈鏈�澶栦晶搴撲綅
- public static List<String> getGroupOutWrkLoc(String locNo){
+ // 鑾峰彇搴撲綅鍓嶄晶鍏ㄩ儴鍗曞搧鍖哄煙搴撲綅缁�(涓嶅寘鍚渶澶栦晶搴撲綅楂橀鍖哄煙)
+ public static List<String> getGroupOuterSingleLoc(String locNo){
int row = getRow(locNo);
switch (row) {
case 1:
@@ -425,13 +426,13 @@
}};
case 7:
return new ArrayList<String>() {{
- add(zerofill(String.valueOf(6), 2) + locNo.substring(2));
add(zerofill(String.valueOf(5), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(6), 2) + locNo.substring(2));
}};
case 8:
return new ArrayList<String>() {{
- add(zerofill(String.valueOf(9), 2) + locNo.substring(2));
add(zerofill(String.valueOf(10), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(9), 2) + locNo.substring(2));
}};
case 9:
return new ArrayList<String>() {{
@@ -449,8 +450,8 @@
}};
case 15:
return new ArrayList<String>() {{
- add(zerofill(String.valueOf(16), 2) + locNo.substring(2));
add(zerofill(String.valueOf(17), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(16), 2) + locNo.substring(2));
}};
case 16:
return new ArrayList<String>() {{
@@ -464,6 +465,96 @@
return new ArrayList<>();
case 21:
return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(20), 2) + locNo.substring(2));
+ }};
+ default:
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+ }
+
+ // 鑾峰彇搴撲綅鍓嶄晶鍏ㄩ儴浣庨鍖哄煙搴撲綅缁�
+ public static List<String> getGroupOuterSingleLocLowFrequency(String locNo){
+ int row = getRow(locNo);
+ switch (row) {
+ case 1:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(3), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(2), 2) + locNo.substring(2));
+ }};
+ case 2:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(3), 2) + locNo.substring(2));
+ }};
+ case 3:
+ return new ArrayList<>();
+ case 4:
+ case 5:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(4), 2) + locNo.substring(2));
+ }};
+ case 6:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(4), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(5), 2) + locNo.substring(2));
+ }};
+ case 7:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(4), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(5), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(6), 2) + locNo.substring(2));
+ }};
+ case 8:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(11), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(10), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(9), 2) + locNo.substring(2));
+ }};
+ case 9:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(11), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(10), 2) + locNo.substring(2));
+ }};
+ case 10:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(11), 2) + locNo.substring(2));
+ }};
+ case 11:
+ return new ArrayList<>();
+ case 12:
+ case 13:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(12), 2) + locNo.substring(2));
+ }};
+ case 14:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(12), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(13), 2) + locNo.substring(2));
+ }};
+ case 15:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(18), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(17), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(16), 2) + locNo.substring(2));
+ }};
+ case 16:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(18), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(17), 2) + locNo.substring(2));
+ }};
+ case 17:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(18), 2) + locNo.substring(2));
+ }};
+ case 18:
+ return new ArrayList<>();
+ case 19:
+ case 20:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(19), 2) + locNo.substring(2));
+ }};
+ case 21:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(19), 2) + locNo.substring(2));
add(zerofill(String.valueOf(20), 2) + locNo.substring(2));
}};
default:
@@ -665,7 +756,7 @@
if (sign) {
break;
}
- List<String> groupInsideLoc = Utils.getGroupOutWrkLoc(locNo);
+ List<String> groupInsideLoc = Utils.getGroupOuterSingleLoc(locNo);
if (!Cools.isEmpty(groupInsideLoc)) {
for (String insideLoc : groupInsideLoc) {
if (locNos.contains(insideLoc)) {
@@ -709,6 +800,27 @@
}
/**
+ * 妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
+ * 杩斿洖true琛ㄧず鍐呬晶搴撲綅涓嶆槸DFX锛岃繑鍥瀎alse琛ㄧず鍐呬晶搴撲綅鏄疍FX
+ */
+ public static boolean checkInsideLocIsDFX2(String locNo) {
+ LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
+ List<String> insideLoc = Utils.getGroupInsideLoc(locNo);
+ if (insideLoc.size() > 0) {
+ List<LocMast> insideLocMast = locMastService.selectByLocNos(insideLoc);
+ for (LocMast mast : insideLocMast) {
+ if (!mast.getLocSts().equals("D")
+ && !mast.getLocSts().equals("F")
+ && !mast.getLocSts().equals("X")) {
+ //D銆丗銆乆(涓嶈兘閫夊畾杩欎釜澶栦晶搴撲綅)
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
* 妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆銆丼
* 杩斿洖true琛ㄧず鍐呬晶搴撲綅涓嶆槸DFX锛岃繑鍥瀎alse琛ㄧず鍐呬晶搴撲綅鏄疍FX
*/
@@ -730,6 +842,29 @@
return false;
}
+ /**
+ * 闅忔満鑾峰彇鍙敤涓旀湁绌哄簱浣嶇殑鍫嗗灈鏈哄彿
+ */
+ public static Integer getRandomCrnNo(List<Integer> crnNos, Short locType1) {
+ BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
+ Random random = new Random();
+ //鍙敤鍫嗗灈鏈簂ist
+ ArrayList<Integer> normalCrnNos = new ArrayList<>();
+ for (Integer crnNo : crnNos) {
+ List<LocMast> emptyLocMast = locMastService.findEmptyLocMast(locType1, crnNo);
+ if (basCrnpService.checkSiteError(crnNo, true) && emptyLocMast.size() > 0) {
+ normalCrnNos.add(crnNo);
+ }
+ }
+ if (normalCrnNos.size() == 0) {
+ throw new CoolException("娌℃湁鍙敤鍫嗗灈鏈�");
+ }
+ //闅忔満鍙敤鍫嗗灈鏈哄彿
+ Integer randomCrnNo = normalCrnNos.get(random.nextInt(normalCrnNos.size()));
+ return randomCrnNo;
+ }
+
public static void main(String[] args) {
List<String> groupLoc = Utils.getGroupLoc("1300801");
System.out.println(groupLoc);
--
Gitblit v1.9.1