From 24b0b06a6e13f74db86e2c643097b37cada07d58 Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期六, 10 六月 2023 17:24:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 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..5b2270f 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;
@@ -699,6 +700,7 @@
for (LocMast mast : insideLocMast) {
if (!mast.getLocSts().equals("D")
&& !mast.getLocSts().equals("F")
+ && !mast.getLocSts().equals("O")
&& !mast.getLocSts().equals("X")) {
//D銆丗銆乆(涓嶈兘閫夊畾杩欎釜澶栦晶搴撲綅)
return true;
@@ -730,6 +732,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