From 46bc958dc5bac3fd9861284020af5b8883d8e045 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 21 三月 2026 16:06:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java | 283 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 213 insertions(+), 70 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
index 85a9e47..3e5a8e6 100644
--- a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -3,7 +3,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.NotifyMsgType;
import com.zy.asrs.domain.param.CreateLocMoveTaskParam;
@@ -32,6 +33,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.ArrayList;
+import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -71,24 +74,25 @@
//鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
public synchronized void crnIoExecuteNormal() {
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
+ Map<Integer, BasCrnp> dispatchCrnMap = new HashMap<>();
+ Map<Integer, CrnThread> dispatchThreadMap = new HashMap<>();
+ Map<Integer, CrnProtocol> dispatchProtocolMap = new HashMap<>();
for (BasCrnp basCrnp : basCrnps) {
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
- if(crnThread == null){
+ if (crnThread == null) {
continue;
}
CrnProtocol crnProtocol = crnThread.getStatus();
- if(crnProtocol == null){
+ if (crnProtocol == null) {
continue;
}
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ long runningCount = wrkMastService.count(new QueryWrapper<WrkMast>()
.eq("crn_no", basCrnp.getCrnNo())
- .in("wrk_sts", WrkStsType.INBOUND_RUN.sts, WrkStsType.OUTBOUND_RUN.sts, WrkStsType.LOC_MOVE_RUN.sts)
- .orderBy("batch_seq", false)
- );
- if(!wrkMasts.isEmpty()){
+ .in("wrk_sts", WrkStsType.INBOUND_RUN.sts, WrkStsType.OUTBOUND_RUN.sts, WrkStsType.LOC_MOVE_RUN.sts));
+ if (runningCount > 0) {
continue;
}
@@ -104,47 +108,106 @@
if (clearLock != null) {
continue;
}
+ dispatchCrnMap.put(basCrnp.getCrnNo(), basCrnp);
+ dispatchThreadMap.put(basCrnp.getCrnNo(), crnThread);
+ dispatchProtocolMap.put(basCrnp.getCrnNo(), crnProtocol);
+ }
+ }
- // 濡傛灉鏈�杩戜竴娆℃槸鍏ュ簱妯″紡
- if (crnProtocol.getLastIo().equals("I")) {
- if (basCrnp.getInEnable().equals("Y")) {
- boolean result = this.crnExecuteIn(basCrnp, crnThread);// 鍏ュ簱
- crnProtocol.setLastIo("O");
- if (result) {
- break;
- }
- } else if (basCrnp.getOutEnable().equals("Y")) {
- boolean result = this.crnExecuteOut(basCrnp, crnThread);// 鍑哄簱
- crnProtocol.setLastIo("I");
- if (result) {
- break;
- }
- }
- }
- // 濡傛灉鏈�杩戜竴娆℃槸鍑哄簱妯″紡
- else if (crnProtocol.getLastIo().equals("O")) {
- if (basCrnp.getOutEnable().equals("Y")) {
- boolean result = this.crnExecuteOut(basCrnp, crnThread);// 鍑哄簱
- crnProtocol.setLastIo("I");
- if (result) {
- break;
- }
- } else if (basCrnp.getInEnable().equals("Y")) {
- boolean result = this.crnExecuteIn(basCrnp, crnThread);// 鍏ュ簱
- crnProtocol.setLastIo("O");
- if (result) {
- break;
- }
- }
- }
+ if (dispatchCrnMap.isEmpty()) {
+ return;
+ }
- //搴撲綅绉昏浆
- boolean transfer = this.crnExecuteLocTransfer(basCrnp, crnThread);
+ List<WrkMast> taskQueue = wrkMastService.list(new QueryWrapper<WrkMast>()
+ .in("crn_no", new ArrayList<>(dispatchCrnMap.keySet()))
+ .in("wrk_sts",
+ WrkStsType.INBOUND_DEVICE_RUN.sts,
+ WrkStsType.NEW_OUTBOUND.sts,
+ WrkStsType.NEW_LOC_MOVE.sts));
+ taskQueue.sort(Comparator
+ .comparingInt(this::resolveBatchOutboundRank)
+ .thenComparingInt(this::resolveBatchSeqOrder)
+ .thenComparingDouble(this::resolveTaskIoPri)
+ .thenComparingLong(this::resolveTaskQueueTime)
+ .thenComparingInt(this::resolveTaskQueueNo));
+
+ for (WrkMast wrkMast : taskQueue) {
+ if (wrkMast == null || wrkMast.getCrnNo() == null) {
+ continue;
+ }
+
+ Integer crnNo = wrkMast.getCrnNo();
+ BasCrnp basCrnp = dispatchCrnMap.get(crnNo);
+ CrnThread crnThread = dispatchThreadMap.get(crnNo);
+ CrnProtocol crnProtocol = dispatchProtocolMap.get(crnNo);
+ if (basCrnp == null || crnThread == null || crnProtocol == null) {
+ continue;
+ }
+
+ if (wrkMast.getWrkSts() != null && wrkMast.getWrkSts() == WrkStsType.INBOUND_DEVICE_RUN.sts) {
+ boolean result = this.crnExecuteInPlanner(basCrnp, crnThread, wrkMast);
+ if (result) {
+ crnProtocol.setLastIo("O");
+ return;
+ }
+ continue;
+ }
+
+ if (wrkMast.getWrkSts() != null && wrkMast.getWrkSts() == WrkStsType.NEW_OUTBOUND.sts) {
+ boolean result = this.crnExecuteOutPlanner(basCrnp, crnThread, wrkMast);
+ if (result) {
+ crnProtocol.setLastIo("I");
+ return;
+ }
+ continue;
+ }
+
+ if (wrkMast.getWrkSts() != null && wrkMast.getWrkSts() == WrkStsType.NEW_LOC_MOVE.sts) {
+ boolean transfer = this.crnExecuteMovePlanner(basCrnp, crnThread, wrkMast);
if (transfer) {
- break;
+ return;
}
}
}
+ }
+
+ private int resolveBatchOutboundRank(WrkMast wrkMast) {
+ return isBatchOutboundTask(wrkMast) ? 0 : 1;
+ }
+
+ private int resolveBatchSeqOrder(WrkMast wrkMast) {
+ if (!isBatchOutboundTask(wrkMast) || wrkMast.getBatchSeq() == null) {
+ return Integer.MAX_VALUE;
+ }
+ return wrkMast.getBatchSeq();
+ }
+
+ private double resolveTaskIoPri(WrkMast wrkMast) {
+ if (wrkMast == null || wrkMast.getIoPri() == null) {
+ return Double.MAX_VALUE;
+ }
+ return wrkMast.getIoPri();
+ }
+
+ private long resolveTaskQueueTime(WrkMast wrkMast) {
+ if (wrkMast == null) {
+ return Long.MAX_VALUE;
+ }
+ Date queueTime = wrkMast.getAppeTime() != null ? wrkMast.getAppeTime() : wrkMast.getIoTime();
+ return queueTime == null ? Long.MAX_VALUE : queueTime.getTime();
+ }
+
+ private int resolveTaskQueueNo(WrkMast wrkMast) {
+ if (wrkMast == null || wrkMast.getWrkNo() == null) {
+ return Integer.MAX_VALUE;
+ }
+ return wrkMast.getWrkNo();
+ }
+
+ private boolean isBatchOutboundTask(WrkMast wrkMast) {
+ return wrkMast != null
+ && Integer.valueOf(WrkIoType.OUT.id).equals(wrkMast.getIoType())
+ && !Cools.isEmpty(wrkMast.getBatch());
}
private synchronized boolean crnExecuteIn(BasCrnp basCrnp, CrnThread crnThread) {
@@ -211,7 +274,7 @@
}
// 鑾峰彇搴撲綅淇℃伅
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ LocMast locMast = locMastService.getById(wrkMast.getLocNo());
if (locMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "鐩爣搴撲綅:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getLocNo());
continue;
@@ -264,30 +327,22 @@
return false;
}
- int stationMaxTaskCount = 30;
- Object systemConfigMapObj = redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
- if (systemConfigMapObj != null) {
- try {
- HashMap<String, String> systemConfigMap = (HashMap<String, String>) systemConfigMapObj;
- stationMaxTaskCount = Integer.parseInt(systemConfigMap.getOrDefault("stationMaxTaskCountLimit", "30"));
- } catch (Exception ignore) {}
- }
-
- int currentStationTaskCount = stationOperateProcessUtils.getCurrentStationTaskCount();
- if (stationMaxTaskCount > 0 && currentStationTaskCount >= stationMaxTaskCount) {
- News.warn("杈撻�佺珯鐐逛换鍔℃暟閲忚揪鍒颁笂闄愶紝宸插仠姝换鍔′笅鍙戙�傚綋鍓嶄换鍔℃暟={}锛屼笂闄�={}", currentStationTaskCount, stationMaxTaskCount);
+ if (isOutboundStationTaskLimitReached()) {
return false;
}
Integer crnNo = basCrnp.getCrnNo();
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("crn_no", crnNo)
.eq("wrk_sts", WrkStsType.NEW_OUTBOUND.sts)
- .orderBy("batch_seq", false)
+ .orderBy(true, true, "batch_seq")
);
for (WrkMast wrkMast : wrkMasts) {
+ if (!allowBatchOutboundExecute(wrkMast)) {
+ continue;
+ }
for (StationObjModel stationObjModel : outStationList) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, stationObjModel.getDeviceNo());
if (stationThread == null) {
@@ -318,7 +373,7 @@
}
// 鑾峰彇搴撲綅淇℃伅
- LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
+ LocMast locMast = locMastService.getById(wrkMast.getSourceLocNo());
if (locMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "婧愬簱浣�:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getSourceLocNo());
continue;
@@ -412,7 +467,7 @@
}
// 鑾峰彇搴撲綅淇℃伅
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ LocMast locMast = locMastService.getById(wrkMast.getLocNo());
if (locMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "鐩爣搴撲綅:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getLocNo());
continue;
@@ -465,7 +520,15 @@
return false;
}
+ if (isOutboundStationTaskLimitReached()) {
+ return false;
+ }
+
Integer crnNo = basCrnp.getCrnNo();
+
+ if (!allowBatchOutboundExecute(wrkMast)) {
+ return false;
+ }
for (StationObjModel stationObjModel : outStationList) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, stationObjModel.getDeviceNo());
@@ -497,7 +560,7 @@
}
// 鑾峰彇搴撲綅淇℃伅
- LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
+ LocMast locMast = locMastService.getById(wrkMast.getSourceLocNo());
if (locMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "婧愬簱浣�:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getSourceLocNo());
continue;
@@ -533,6 +596,86 @@
return false;
}
+ private boolean allowBatchOutboundExecute(WrkMast wrkMast) {
+ if (wrkMast == null || Cools.isEmpty(wrkMast.getBatch())) {
+ return true;
+ }
+
+ if (Cools.isEmpty(wrkMast.getBatchSeq())) {
+ News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 缂哄皯鎵规搴忓彿锛屾殏涓嶅厑璁稿爢鍨涙満鍑哄簱", wrkMast.getBatch());
+ return false;
+ }
+
+ WrkMast firstBatchWrkMast = wrkMastService.getOne(new QueryWrapper<WrkMast>()
+ .eq("io_type", WrkIoType.OUT.id)
+ .eq("batch", wrkMast.getBatch())
+ .orderByAsc("batch_seq")
+ .orderByAsc("wrk_no")
+ .last("limit 1"));
+ if (firstBatchWrkMast == null) {
+ return true;
+ }
+
+ if (Cools.isEmpty(firstBatchWrkMast.getBatchSeq())) {
+ News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 瀛樺湪鏈厤缃壒娆″簭鍙风殑浠诲姟锛屾殏涓嶅厑璁稿爢鍨涙満鍑哄簱", wrkMast.getBatch());
+ return false;
+ }
+
+ boolean currentIsFirstBatchTask = wrkMast.getWrkNo().equals(firstBatchWrkMast.getWrkNo());
+ boolean firstBatchTaskExecuted = firstBatchWrkMast.getWrkSts() != null
+ && !firstBatchWrkMast.getWrkSts().equals(WrkStsType.NEW_OUTBOUND.sts);
+ if (!currentIsFirstBatchTask && !firstBatchTaskExecuted) {
+ News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 棣栦釜搴忓彿浠诲姟:{} 灏氭湭鎵ц锛屽綋鍓嶄换鍔℃殏涓嶅厑璁稿嚭搴�", wrkMast.getBatch(), firstBatchWrkMast.getWrkNo());
+ return false;
+ }
+
+ int batchRunningLimit = getSystemConfigInt("crnOutBatchRunningLimit", 5);
+ if (batchRunningLimit <= 0) {
+ return true;
+ }
+
+ long batchRunningCount = wrkMastService.count(new QueryWrapper<WrkMast>()
+ .eq("io_type", WrkIoType.OUT.id)
+ .eq("batch", wrkMast.getBatch())
+ .notIn("wrk_sts",
+ WrkStsType.NEW_OUTBOUND.sts,
+ WrkStsType.COMPLETE_OUTBOUND.sts,
+ WrkStsType.SETTLE_OUTBOUND.sts));
+ if (batchRunningCount >= batchRunningLimit) {
+ News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 鎵ц涓换鍔℃暟杈惧埌涓婇檺锛屽綋鍓�={}锛屼笂闄�={}", wrkMast.getBatch(), batchRunningCount, batchRunningLimit);
+ return false;
+ }
+
+ return true;
+ }
+
+ private boolean isOutboundStationTaskLimitReached() {
+ int stationMaxTaskCount = getSystemConfigInt("stationMaxTaskCountLimit", 30);
+ if (stationMaxTaskCount <= 0) {
+ return false;
+ }
+
+ int currentStationTaskCount = stationOperateProcessUtils.getCurrentStationTaskCount();
+ if (currentStationTaskCount >= stationMaxTaskCount) {
+ News.warn("杈撻�佺珯鐐逛换鍔℃暟閲忚揪鍒颁笂闄愶紝宸插仠姝换鍔′笅鍙戙�傚綋鍓嶄换鍔℃暟={}锛屼笂闄�={}", currentStationTaskCount, stationMaxTaskCount);
+ return true;
+ }
+ return false;
+ }
+
+ private int getSystemConfigInt(String code, int defaultValue) {
+ Object systemConfigMapObj = redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
+ if (systemConfigMapObj == null) {
+ return defaultValue;
+ }
+ try {
+ HashMap<String, String> systemConfigMap = (HashMap<String, String>) systemConfigMapObj;
+ return Integer.parseInt(systemConfigMap.getOrDefault(code, String.valueOf(defaultValue)));
+ } catch (Exception ignore) {
+ return defaultValue;
+ }
+ }
+
private synchronized boolean crnExecuteLocTransfer(BasCrnp basCrnp, CrnThread crnThread) {
CrnProtocol crnProtocol = crnThread.getStatus();
if(crnProtocol == null){
@@ -541,14 +684,14 @@
Integer crnNo = basCrnp.getCrnNo();
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("crn_no", crnNo)
.eq("wrk_sts", WrkStsType.NEW_LOC_MOVE.sts)
);
for (WrkMast wrkMast : wrkMasts) {
// 鑾峰彇婧愬簱浣嶄俊鎭�
- LocMast sourceLocMast = locMastService.selectById(wrkMast.getSourceLocNo());
+ LocMast sourceLocMast = locMastService.getById(wrkMast.getSourceLocNo());
if (sourceLocMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "婧愬簱浣�:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getSourceLocNo());
continue;
@@ -560,7 +703,7 @@
}
// 鑾峰彇搴撲綅淇℃伅
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ LocMast locMast = locMastService.getById(wrkMast.getLocNo());
if (locMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "搴撲綅:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getLocNo());
continue;
@@ -589,7 +732,7 @@
//鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴�
public synchronized void crnIoExecuteFinish() {
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
if(crnThread == null){
@@ -663,7 +806,7 @@
public synchronized void plannerExecute() {
int nowSec = (int) (System.currentTimeMillis() / 1000);
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
String key = RedisKeyType.PLANNER_SCHEDULE.key + "CRN-" + basCrnp.getCrnNo();
List<Object> items = redisUtil.lGet(key, 0, -1);
@@ -679,7 +822,7 @@
if (crnProtocol == null) {
continue;
}
- List<WrkMast> running = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> running = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("crn_no", basCrnp.getCrnNo())
.in("wrk_sts", WrkStsType.INBOUND_RUN.sts, WrkStsType.OUTBOUND_RUN.sts, WrkStsType.LOC_MOVE_RUN.sts)
);
@@ -771,7 +914,7 @@
}
// 鑾峰彇婧愬簱浣嶄俊鎭�
- LocMast sourceLocMast = locMastService.selectById(wrkMast.getSourceLocNo());
+ LocMast sourceLocMast = locMastService.getById(wrkMast.getSourceLocNo());
if (sourceLocMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "婧愬簱浣�:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getSourceLocNo());
return false;
@@ -783,7 +926,7 @@
}
// 鑾峰彇搴撲綅淇℃伅
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ LocMast locMast = locMastService.getById(wrkMast.getLocNo());
if (locMast == null) {
News.taskInfo(wrkMast.getWrkNo(), "搴撲綅:{} 淇℃伅涓嶅瓨鍦�", wrkMast.getLocNo());
return false;
--
Gitblit v1.9.1