From f13ca3de8d05626a0847d2651b8cedbb32da5927 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 11 七月 2023 11:24:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index d4e1661..1956e72 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;
@@ -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>() {{
@@ -709,6 +710,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 +752,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