From abc40d18cdfde0826bd7ae1377e9973cff3eefb8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 08 四月 2025 08:59:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java | 61 ++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
index e73f080..af19382 100644
--- a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -21,9 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* Created by Monkey D. Luffy on 2023.07.24
@@ -61,18 +59,38 @@
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.PAKOUT.type);
ArrayList<Integer> crns =new ArrayList<>();
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts", 3).eq("out_enable", "Y").eq("wrk_no", 0));
- for (BasCrnp basCrnp : basCrnps){
- crns.add(basCrnp.getCrnNo());
- }
+
crns.add(1);
crns.add(2);
crns.add(3);
crns.add(4);
crns.add(5);
crns.add(6);
- boolean sign = true;
+
+ ArrayList<Integer> crnList =new ArrayList<>();
+ int[] crnCount = new int[6];
for (Integer crnNo : crns){
+ int crnCountD = locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_sts", "D").eq("crn_no", crnNo));
+ crnCount[crnNo-1] = crnCountD;
+ }
+ int[] sortedCrnNos = getSortedCrnNos(crnCount);
+ for (int crnNo : sortedCrnNos){
+ crnList.add(crnNo);
+ }
+ crnList.add(6);
+ crnList.add(1);
+ crnList.add(4);
+ crnList.add(3);
+ crnList.add(5);
+ crnList.add(2);
+
+// List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts", 3).eq("out_enable", "Y").eq("wrk_no", 0));
+// for (BasCrnp basCrnp : basCrnps){
+// crns.add(basCrnp.getCrnNo());
+// }
+
+ boolean sign = true;
+ for (Integer crnNo : crnList){
BasCrnp basCrnp = basCrnpService.selectById(crnNo);
if (basCrnp.getCrnSts()!=3 || !basCrnp.getOutEnable().equals("Y")){
continue;
@@ -135,7 +153,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
- wrkMast.setIoPri(10D);
+ wrkMast.setIoPri(99999999D);
wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
wrkMast.setStaNo(staNo); // 鐩爣绔�
wrkMast.setCrnNo(locMast.getCrnNo());
@@ -177,4 +195,29 @@
}
return SUCCESS;
}
+
+ /**
+ * 鏍规嵁鍫嗗灈鏈烘暟閲忎粠澶у埌灏忔帓搴忥紝杩斿洖鎺掑簭鍚庣殑鍫嗗灈鏈哄彿
+ *
+ * @param crnCount 鍫嗗灈鏈烘暟閲忔暟缁勶紝绱㈠紩琛ㄧず鍫嗗灈鏈哄彿鍑� 1
+ * @return 鎺掑簭鍚庣殑鍫嗗灈鏈哄彿鏁扮粍
+ */
+ public static int[] getSortedCrnNos(int[] crnCount) {
+ // 鍒涘缓涓�涓垪琛紝瀛樺偍鍫嗗灈鏈哄彿鍜屽搴旂殑鍊�
+ List<Map.Entry<Integer, Integer>> list = new ArrayList<>();
+ for (int i = 0; i < crnCount.length; i++) {
+ list.add(new AbstractMap.SimpleEntry<>(i + 1, crnCount[i])); // 鍫嗗灈鏈哄彿浠� 1 寮�濮�
+ }
+
+ // 鏍规嵁鍊间粠澶у埌灏忔帓搴�
+ list.sort((entry1, entry2) -> entry2.getValue().compareTo(entry1.getValue()));
+
+ // 鎻愬彇鎺掑簭鍚庣殑鍫嗗灈鏈哄彿
+ int[] sortedCrnNos = new int[list.size()];
+ for (int i = 0; i < list.size(); i++) {
+ sortedCrnNos[i] = list.get(i).getKey();
+ }
+
+ return sortedCrnNos;
+ }
}
--
Gitblit v1.9.1