From 37348c5855649e98defe0f5b1557750cb7c84aa5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 02 三月 2026 16:56:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 350 +++++++++++++++++++++++++++++++++--
src/main/java/com/zy/core/enums/WrkStsType.java | 1
src/main/java/com/zy/asrs/entity/BasDevp.java | 39 +++
src/main/java/com/zy/common/utils/NavigateUtils.java | 8
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java | 2
src/main/java/com/zy/core/enums/RedisKeyType.java | 2
src/main/java/com/zy/core/network/fake/ZyStationFakeSegConnect.java | 111 ++++++++--
src/main/java/com/zy/common/service/CommonService.java | 5
src/main/java/com/zy/common/utils/NavigateSolution.java | 43 +++
src/main/resources/application.yml | 2
src/main/java/com/zy/core/plugin/FakeProcess.java | 8
11 files changed, 515 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index c807969..5b15930 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -243,4 +243,43 @@
return list;
}
+ public List<StationObjModel> getOutOrderList$(){
+ List<StationObjModel> list = new ArrayList<>();
+ if (Cools.isEmpty(this.isOutOrderList)){
+ return list;
+ }
+
+ List<StationObjModel> jsonList = JSON.parseArray(this.isOutOrderList, StationObjModel.class);
+ for (StationObjModel json : jsonList){
+ list.add(json);
+ }
+ return list;
+ }
+
+ public List<Integer> getOutOrderIntList(){
+ List<Integer> list = new ArrayList<>();
+ if (Cools.isEmpty(this.isOutOrderList)){
+ return list;
+ }
+
+ List<StationObjModel> jsonList = JSON.parseArray(this.isOutOrderList, StationObjModel.class);
+ for (StationObjModel json : jsonList){
+ list.add(json.getStationId());
+ }
+ return list;
+ }
+
+ public List<StationObjModel> getLiftTransferList$(){
+ List<StationObjModel> list = new ArrayList<>();
+ if (Cools.isEmpty(this.isLiftTransferList)){
+ return list;
+ }
+
+ List<StationObjModel> jsonList = JSON.parseArray(this.isLiftTransferList, StationObjModel.class);
+ for (StationObjModel json : jsonList){
+ list.add(json);
+ }
+ return list;
+ }
+
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 6026fd8..43408b8 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -12,10 +12,7 @@
import com.zy.common.utils.NavigateUtils;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
-import com.zy.core.enums.RedisKeyType;
-import com.zy.core.enums.SlaveType;
-import com.zy.core.enums.WrkIoType;
-import com.zy.core.enums.WrkStsType;
+import com.zy.core.enums.*;
import com.zy.core.model.StationObjModel;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/zy/common/utils/NavigateSolution.java b/src/main/java/com/zy/common/utils/NavigateSolution.java
index ef7d708..e2112fc 100644
--- a/src/main/java/com/zy/common/utils/NavigateSolution.java
+++ b/src/main/java/com/zy/common/utils/NavigateSolution.java
@@ -302,22 +302,22 @@
for(String direction : directionList) {
if(direction.equals("top")) {
- NavigateNode node = getValidNavigateNode(map, x - 1, y);
+ NavigateNode node = getValidNavigateNode(map, current_node, x - 1, y, direction);
if(node != null) {
neighbour_node.add(node);
}
}else if(direction.equals("bottom")) {
- NavigateNode node = getValidNavigateNode(map, x + 1, y);
+ NavigateNode node = getValidNavigateNode(map, current_node, x + 1, y, direction);
if(node != null) {
neighbour_node.add(node);
}
}else if(direction.equals("left")) {
- NavigateNode node = getValidNavigateNode(map, x, y - 1);
+ NavigateNode node = getValidNavigateNode(map, current_node, x, y - 1, direction);
if(node != null) {
neighbour_node.add(node);
}
}else if(direction.equals("right")) {
- NavigateNode node = getValidNavigateNode(map, x, y + 1);
+ NavigateNode node = getValidNavigateNode(map, current_node, x, y + 1, direction);
if(node != null) {
neighbour_node.add(node);
}
@@ -325,6 +325,22 @@
}
return neighbour_node;
+ }
+
+ /**
+ * 閭绘帴鐐规牎楠岋細鍙揪 + 鏂瑰悜涓�鑷达紙褰撳墠鑺傜偣涓庝笅涓�鑺傜偣瀵规湰娆¤璧版柟鍚戜竴鑷达級
+ */
+ public NavigateNode getValidNavigateNode(List<List<NavigateNode>> map, NavigateNode currentNode, int x, int y, String moveDirection) {
+ NavigateNode node = getValidNavigateNode(map, x, y);
+ if (node == null) {
+ return null;
+ }
+
+ if (!isDirectionConsistent(currentNode, node, moveDirection)) {
+ return null;
+ }
+
+ return node;
}
public NavigateNode getValidNavigateNode(List<List<NavigateNode>> map, int x, int y) {
@@ -341,6 +357,25 @@
return node;
}
+ private boolean isDirectionConsistent(NavigateNode currentNode, NavigateNode nextNode, String moveDirection) {
+ if (currentNode == null || nextNode == null) {
+ return false;
+ }
+
+ if (moveDirection == null) {
+ return false;
+ }
+
+ List<String> currentDirectionList = currentNode.getDirectionList();
+ List<String> nextDirectionList = nextNode.getDirectionList();
+ if (currentDirectionList == null || nextDirectionList == null) {
+ return false;
+ }
+
+ // 褰撳墠鑺傜偣鍏佽鍚� moveDirection 鍑哄彂锛屼笖涓嬩竴鑺傜偣鍦ㄨ鏂瑰悜涓婁繚鎸佷竴鑷达紝鎵嶅厑璁搁�氳
+ return currentDirectionList.contains(moveDirection) && nextDirectionList.contains(moveDirection);
+ }
+
public NavigateNode findStationNavigateNode(List<List<NavigateNode>> map, int stationId) {
for(int x = 0; x < map.size(); x++) {
for(int y = 0; y < map.get(0).size(); y++) {
diff --git a/src/main/java/com/zy/common/utils/NavigateUtils.java b/src/main/java/com/zy/common/utils/NavigateUtils.java
index 7260751..558414c 100644
--- a/src/main/java/com/zy/common/utils/NavigateUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateUtils.java
@@ -45,12 +45,12 @@
List<List<NavigateNode>> stationMap = navigateSolution.getStationMap(lev);
NavigateNode startNode = navigateSolution.findStationNavigateNode(stationMap, startStationId);
- if (startNode == null){
+ if (startNode == null) {
throw new CoolException("鏈壘鍒拌 璧风偣 瀵瑰簲鐨勮妭鐐�");
}
NavigateNode endNode = navigateSolution.findStationNavigateNode(stationMap, endStationId);
- if (endNode == null){
+ if (endNode == null) {
throw new CoolException("鏈壘鍒拌 缁堢偣 瀵瑰簲鐨勮妭鐐�");
}
@@ -70,12 +70,12 @@
//鍘婚噸
HashSet<Integer> set = new HashSet<>();
List<NavigateNode> fitlerList = new ArrayList<>();
- for(NavigateNode navigateNode : list){
+ for (NavigateNode navigateNode : list) {
JSONObject valuObject = JSON.parseObject(navigateNode.getNodeValue());
if (valuObject.containsKey("rgvCalcFlag")) {
continue;
}
- if(set.add(valuObject.getInteger("stationId"))){
+ if (set.add(valuObject.getInteger("stationId"))) {
fitlerList.add(navigateNode);
}
}
diff --git a/src/main/java/com/zy/core/enums/RedisKeyType.java b/src/main/java/com/zy/core/enums/RedisKeyType.java
index eff66b9..755e0d5 100644
--- a/src/main/java/com/zy/core/enums/RedisKeyType.java
+++ b/src/main/java/com/zy/core/enums/RedisKeyType.java
@@ -59,6 +59,8 @@
DUAL_CRN_OUT_TASK_COMPLETE_STATION_INFO("dual_crn_out_task_complete_station_info_"),
CRN_OUT_TASK_COMPLETE_STATION_INFO("crn_out_task_complete_station_info_"),
+ WATCH_CIRCLE_STATION_("watch_circle_station_"),
+
CURRENT_CIRCLE_TASK_CRN_NO("current_circle_task_crn_no_"),
ASYNC_WMS_IN_TASK_REQUEST("async_wms_in_task_request_"),
ASYNC_WMS_IN_TASK_RESPONSE("async_wms_in_task_response_"),
diff --git a/src/main/java/com/zy/core/enums/WrkStsType.java b/src/main/java/com/zy/core/enums/WrkStsType.java
index 59b4665..381ccfc 100644
--- a/src/main/java/com/zy/core/enums/WrkStsType.java
+++ b/src/main/java/com/zy/core/enums/WrkStsType.java
@@ -15,6 +15,7 @@
OUTBOUND_RUN(102, "璁惧鎼繍涓�"),
OUTBOUND_RUN_COMPLETE(103, "璁惧鎼繍瀹屾垚"),
STATION_RUN(104, "绔欑偣杩愯涓�"),
+ STATION_RUN_COMPLETE(105, "绔欑偣杩愯瀹屾垚"),
COMPLETE_OUTBOUND(109, "鍑哄簱瀹屾垚"),
SETTLE_OUTBOUND(110, "鍑哄簱搴撳瓨鏇存柊"),
diff --git a/src/main/java/com/zy/core/network/fake/ZyStationFakeSegConnect.java b/src/main/java/com/zy/core/network/fake/ZyStationFakeSegConnect.java
index 4530d45..a39b1b7 100644
--- a/src/main/java/com/zy/core/network/fake/ZyStationFakeSegConnect.java
+++ b/src/main/java/com/zy/core/network/fake/ZyStationFakeSegConnect.java
@@ -128,6 +128,8 @@
boolean initialized = false;
// 涓婁竴姝ユ墽琛屾椂闂达紙鐢ㄤ簬鍫靛妫�娴嬶級
long stepExecuteTime = System.currentTimeMillis();
+ // 閬垮厤鍦ㄥ埌杈剧洰鏍囧悗閲嶅鎵ц鍒颁綅閫昏緫
+ boolean arrivalHandled = false;
while (true) {
if (Thread.currentThread().isInterrupted()) {
@@ -144,12 +146,21 @@
if (command != null) {
taskLastUpdateTime.put(taskNo, System.currentTimeMillis());
- // 棣栨鎺ユ敹鍛戒护鏃跺垵濮嬪寲
- if (finalTargetStationId == null) {
- finalTargetStationId = command.getTargetStaNo();
- if (checkTaskNoInArea(taskNo)) {
- generateBarcode = true;
+ // 姣忔鎺ユ敹鍛戒护閮藉埛鏂扮洰鏍囷紝閬垮厤娌跨敤鏃х洰鏍囧鑷寸姸鎬佹姈鍔�
+ Integer commandTargetStationId = command.getTargetStaNo();
+ if (commandTargetStationId != null) {
+ if (!commandTargetStationId.equals(finalTargetStationId)) {
+ arrivalHandled = false;
+ News.info("[WCS Debug] 浠诲姟{}鍒囨崲鐩爣: {} -> {}", taskNo, finalTargetStationId,
+ commandTargetStationId);
}
+ finalTargetStationId = commandTargetStationId;
+ // 褰撳墠绔欑偣鍏堝悓姝ユ渶鏂扮洰鏍囷紝閬垮厤涓婂眰鍦ㄧ獥鍙ｆ湡閲嶅涓嬪彂鍚屼竴璺緞
+ syncCurrentStationTarget(taskNo, currentStationId, finalTargetStationId);
+ }
+
+ if (!generateBarcode && checkTaskNoInArea(taskNo)) {
+ generateBarcode = true;
}
// 灏嗘柊璺緞杩藉姞鍒板緟鎵ц闃熷垪
@@ -157,15 +168,7 @@
if (newPath != null && !newPath.isEmpty()) {
// 鑾峰彇闃熷垪涓渶鍚庝竴涓珯鐐癸紙鐢ㄤ簬琛旀帴鐐瑰幓閲嶏級
Integer lastInQueue = getLastInQueue(pendingPathQueue);
- if (lastInQueue == null) {
- lastInQueue = currentStationId;
- }
-
- int startIndex = 0;
- // 濡傛灉鏂拌矾寰勭殑璧风偣涓庡綋鍓嶄綅缃垨闃熷垪鏈熬閲嶅锛屽垯璺宠繃
- if (lastInQueue != null && !newPath.isEmpty() && newPath.get(0).equals(lastInQueue)) {
- startIndex = 1;
- }
+ int startIndex = getPathAppendStartIndex(newPath, currentStationId, lastInQueue);
for (int i = startIndex; i < newPath.size(); i++) {
pendingPathQueue.offer(newPath.get(i));
@@ -232,6 +235,7 @@
currentStationId = nextStationId;
pendingPathQueue.poll();
stepExecuteTime = System.currentTimeMillis();
+ arrivalHandled = false;
News.info("[WCS Debug] 浠诲姟{}绉诲姩鍒扮珯鐐�: {}, 鍓╀綑闃熷垪: {}", taskNo, currentStationId,
pendingPathQueue.size());
sleep(1000); // 妯℃嫙绉诲姩鑰楁椂
@@ -261,18 +265,20 @@
// 璺緞闃熷垪涓虹┖锛岀瓑寰呮柊鐨勫垎娈靛懡浠�
if (currentStationId != null && finalTargetStationId != null
&& currentStationId.equals(finalTargetStationId)) {
- // 宸插埌杈炬渶缁堢洰鏍囷紝姝ｅ父缁撴潫
- if (generateBarcode) {
- Integer targetDeviceNo = getDeviceNoByStationId(finalTargetStationId);
- if (targetDeviceNo != null) {
- generateStationBarcode(taskNo, finalTargetStationId, targetDeviceNo);
- News.info("[WCS Debug] 浠诲姟{}鍒拌揪鐩爣{}骞剁敓鎴愭潯鐮�", taskNo, finalTargetStationId);
+ // 宸插埌杈剧洰鏍囷紝鍏堟墽琛屼竴娆″埌浣嶉�昏緫锛岀劧鍚庣户缁瓑寰呬笅涓�鏉＄Щ鍔ㄥ懡浠�
+ if (!arrivalHandled) {
+ if (generateBarcode) {
+ Integer targetDeviceNo = getDeviceNoByStationId(finalTargetStationId);
+ if (targetDeviceNo != null) {
+ generateStationBarcode(taskNo, finalTargetStationId, targetDeviceNo);
+ News.info("[WCS Debug] 浠诲姟{}鍒拌揪鐩爣{}骞剁敓鎴愭潯鐮�", taskNo, finalTargetStationId);
+ }
}
+ arrivalHandled = true;
}
- break;
}
- // 鏈埌杈炬渶缁堢洰鏍囷紝绛夊緟鏂扮殑鍒嗘鍛戒护
+ // 缁х画绛夊緟鏂扮殑鍒嗘鍛戒护
Long lastTime = taskLastUpdateTime.get(taskNo);
if (lastTime != null && System.currentTimeMillis() - lastTime > 30000) {
// 瓒呮椂锛�30绉掑唴娌℃湁鏀跺埌鏂板垎娈靛懡浠�
@@ -305,6 +311,67 @@
}
/**
+ * 璁＄畻鏂拌矾寰勫湪闃熷垪涓殑杩藉姞璧风偣锛岄伩鍏嶉噸澶嶄笅鍙戝鑷磋矾寰勬潵鍥炶烦
+ */
+ private int getPathAppendStartIndex(List<Integer> newPath, Integer currentStationId, Integer lastInQueue) {
+ if (newPath == null || newPath.isEmpty()) {
+ return 0;
+ }
+
+ if (lastInQueue != null) {
+ int idx = newPath.lastIndexOf(lastInQueue);
+ if (idx >= 0) {
+ return idx + 1;
+ }
+ }
+
+ if (currentStationId != null) {
+ int idx = newPath.lastIndexOf(currentStationId);
+ if (idx >= 0) {
+ return idx + 1;
+ }
+ }
+
+ return 0;
+ }
+
+ /**
+ * 鍛戒护鍒氬埌杈炬椂鍚屾褰撳墠绔欑偣鐩爣锛岄檷浣庝笂灞傞噸澶嶅彂鍚屼竴璺緞鐨勬鐜�
+ */
+ private void syncCurrentStationTarget(Integer taskNo, Integer currentStationId, Integer targetStationId) {
+ if (currentStationId == null || targetStationId == null) {
+ return;
+ }
+ Integer currentDeviceNo = getDeviceNoByStationId(currentStationId);
+ if (currentDeviceNo == null) {
+ return;
+ }
+
+ lockStations(currentStationId);
+ try {
+ List<ZyStationStatusEntity> statusList = deviceStatusMap.get(currentDeviceNo);
+ if (statusList == null) {
+ return;
+ }
+
+ ZyStationStatusEntity currentStatus = statusList.stream()
+ .filter(item -> item.getStationId().equals(currentStationId)).findFirst().orElse(null);
+ if (currentStatus == null) {
+ return;
+ }
+
+ if (currentStatus.getTaskNo() != null && currentStatus.getTaskNo() > 0
+ && !currentStatus.getTaskNo().equals(taskNo) && currentStatus.isLoading()) {
+ return;
+ }
+
+ updateStationDataInternal(currentStationId, currentDeviceNo, taskNo, targetStationId, null, null, null);
+ } finally {
+ unlockStations(currentStationId);
+ }
+ }
+
+ /**
* 鑾峰彇鏄惁鍏佽妫�鏌ュ牭濉炵殑閰嶇疆
*/
private boolean getFakeAllowCheckBlock() {
diff --git a/src/main/java/com/zy/core/plugin/FakeProcess.java b/src/main/java/com/zy/core/plugin/FakeProcess.java
index 21d96f9..e1cef49 100644
--- a/src/main/java/com/zy/core/plugin/FakeProcess.java
+++ b/src/main/java/com/zy/core/plugin/FakeProcess.java
@@ -125,6 +125,12 @@
stationOperateProcessUtils.crnStationOutExecute();
// 妫�娴嬭緭閫佺珯鐐瑰嚭搴撲换鍔℃墽琛屽畬鎴�
stationOperateProcessUtils.stationOutExecuteFinish();
+ // 妫�娴嬩换鍔¤浆瀹屾垚
+ stationOperateProcessUtils.checkTaskToComplete();
+ // 妫�娴嬪嚭搴撴帓搴�
+ stationOperateProcessUtils.checkStationOutOrder();
+ // 鐩戞帶缁曞湀绔欑偣
+ stationOperateProcessUtils.watchCircleStation();
// 鎵ц鍙屽伐浣嶅爢鍨涙満浠诲姟
dualCrnOperateProcessUtils.dualCrnIoExecute();
@@ -600,7 +606,7 @@
continue;
}
- if (System.currentTimeMillis() - stayTime > 1000 * 15) {
+ if (System.currentTimeMillis() - stayTime > 1000 * 60) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp,
stationObjModel.getDeviceNo());
if (stationThread == null) {
diff --git a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
index 0f93ef3..ebf1408 100644
--- a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -84,6 +84,7 @@
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
.eq("crn_no", basCrnp.getCrnNo())
.in("wrk_sts", WrkStsType.INBOUND_RUN.sts, WrkStsType.OUTBOUND_RUN.sts)
+ .orderBy("batch_seq", false)
);
if(!wrkMasts.isEmpty()){
continue;
@@ -262,6 +263,7 @@
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
.eq("crn_no", crnNo)
.eq("wrk_sts", WrkStsType.NEW_OUTBOUND.sts)
+ .orderBy("batch_seq", false)
);
for (WrkMast wrkMast : wrkMasts) {
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index a41ff8a..1e8058c 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -2,15 +2,19 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.NotifyMsgType;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.NotifyUtils;
import com.zy.common.entity.FindCrnNoResult;
+import com.zy.common.model.NavigateNode;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
+import com.zy.common.utils.NavigateUtils;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
@@ -36,10 +40,6 @@
@Autowired
private CommonService commonService;
@Autowired
- private BasCrnpService basCrnpService;
- @Autowired
- private BasDualCrnpService basDualCrnpService;
- @Autowired
private RedisUtil redisUtil;
@Autowired
private LocMastService locMastService;
@@ -47,6 +47,10 @@
private WmsOperateUtils wmsOperateUtils;
@Autowired
private NotifyUtils notifyUtils;
+ @Autowired
+ private NavigateUtils navigateUtils;
+ @Autowired
+ private BasStationService basStationService;
//鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
public synchronized void stationInExecute() {
@@ -136,6 +140,8 @@
.eq("wrk_sts", WrkStsType.OUTBOUND_RUN_COMPLETE.sts)
.isNotNull("crn_no")
);
+ List<Integer> outOrderList = getAllOutOrderList();
+
for (WrkMast wrkMast : wrkMasts) {
Object infoObj = redisUtil.get(RedisKeyType.CRN_OUT_TASK_COMPLETE_STATION_INFO.key + wrkMast.getWrkNo());
if (infoObj == null) {
@@ -165,7 +171,24 @@
&& stationProtocol.isLoading()
&& stationProtocol.getTaskNo() == 0
) {
- StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationProtocol.getStationId(), wrkMast.getStaNo(), 0);
+ Integer moveStaNo = wrkMast.getStaNo();
+
+ if (!outOrderList.isEmpty()) {
+ List<NavigateNode> nodes = navigateUtils.calcByStationId(stationProtocol.getStationId(), wrkMast.getStaNo());
+ for (int i = nodes.size() - 1; i >= 0; i--) {
+ NavigateNode node = nodes.get(i);
+ JSONObject v = JSONObject.parseObject(node.getNodeValue());
+ if (v != null) {
+ Integer stationId = v.getInteger("stationId");
+ if (outOrderList.contains(stationId)) {
+ moveStaNo = stationId;
+ break;
+ }
+ }
+ }
+ }
+
+ StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationProtocol.getStationId(), moveStaNo, 0);
if (command == null) {
News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
continue;
@@ -178,7 +201,6 @@
MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
News.info("杈撻�佺珯鐐瑰嚭搴撳懡浠や笅鍙戞垚鍔燂紝绔欑偣鍙�={}锛屽伐浣滃彿={}锛屽懡浠ゆ暟鎹�={}", stationProtocol.getStationId(), wrkMast.getWrkNo(), JSON.toJSONString(command));
redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_LIMIT.key + stationProtocol.getStationId(), "lock", 5);
- redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_COMPLETE_LIMIT.key + wrkMast.getWrkNo(), "lock", 60);
redisUtil.del(RedisKeyType.CRN_OUT_TASK_COMPLETE_STATION_INFO.key + wrkMast.getWrkNo());
}
}
@@ -238,7 +260,6 @@
notifyUtils.notify(String.valueOf(SlaveType.Devp), stationObjModel.getDeviceNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.STATION_OUT_TASK_RUN, null);
News.info("杈撻�佺珯鐐瑰嚭搴撳懡浠や笅鍙戞垚鍔燂紝绔欑偣鍙�={}锛屽伐浣滃彿={}锛屽懡浠ゆ暟鎹�={}", stationProtocol.getStationId(), wrkMast.getWrkNo(), JSON.toJSONString(command));
redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_LIMIT.key + stationProtocol.getStationId(), "lock", 5);
- redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_COMPLETE_LIMIT.key + wrkMast.getWrkNo(), "lock", 60);
redisUtil.del(RedisKeyType.DUAL_CRN_OUT_TASK_STATION_INFO.key + wrkMast.getWrkNo());
}
}
@@ -254,26 +275,73 @@
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN.sts));
for (WrkMast wrkMast : wrkMasts) {
Integer wrkNo = wrkMast.getWrkNo();
+ Integer targetStaNo = wrkMast.getStaNo();
+
+ boolean complete = false;
+ BasStation basStation = basStationService.selectOne(new EntityWrapper<BasStation>().eq("station_id", targetStaNo));
+ if (basStation == null) {
+ continue;
+ }
+
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basStation.getDeviceNo());
+ if (stationThread == null) {
+ continue;
+ }
+
+ Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
+ StationProtocol stationProtocol = statusMap.get(basStation.getStationId());
+ if (stationProtocol == null) {
+ continue;
+ }
+
+ if (stationProtocol.getTaskNo().equals(wrkNo)) {
+ complete = true;
+ }
+
+ if (complete) {
+ wrkMast.setWrkSts(WrkStsType.STATION_RUN_COMPLETE.sts);
+ wrkMast.setIoTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_COMPLETE_LIMIT.key + wrkMast.getWrkNo(), "lock", 60);
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ // 妫�娴嬩换鍔¤浆瀹屾垚
+ public synchronized void checkTaskToComplete() {
+ try {
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN_COMPLETE.sts));
+ for (WrkMast wrkMast : wrkMasts) {
+ Integer wrkNo = wrkMast.getWrkNo();
+ Integer targetStaNo = wrkMast.getStaNo();
Object lock = redisUtil.get(RedisKeyType.STATION_OUT_EXECUTE_COMPLETE_LIMIT.key + wrkNo);
if (lock != null) {
continue;
}
- boolean complete = true;
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
- for (BasDevp basDevp : basDevps) {
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
- if (stationThread == null) {
- continue;
- }
+ boolean complete = false;
+ BasStation basStation = basStationService.selectOne(new EntityWrapper<BasStation>().eq("station_id", targetStaNo));
+ if (basStation == null) {
+ continue;
+ }
- List<StationProtocol> list = stationThread.getStatus();
- for (StationProtocol stationProtocol : list) {
- if (stationProtocol.getTaskNo().equals(wrkNo)) {
- complete = false;
- }
- }
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basStation.getDeviceNo());
+ if (stationThread == null) {
+ continue;
+ }
+
+ Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
+ StationProtocol stationProtocol = statusMap.get(basStation.getStationId());
+ if (stationProtocol == null) {
+ continue;
+ }
+
+ if (!stationProtocol.getTaskNo().equals(wrkNo)) {
+ complete = true;
}
if (complete) {
@@ -444,5 +512,247 @@
return currentStationTaskCount;
}
+ // 妫�娴嬪嚭搴撴帓搴�
+ public synchronized void checkStationOutOrder() {
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
+ for (BasDevp basDevp : basDevps) {
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getId());
+ if (stationThread == null) {
+ continue;
+ }
+ Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
+ List<StationObjModel> orderList = basDevp.getOutOrderList$();
+ for (StationObjModel stationObjModel : orderList) {
+ StationProtocol stationProtocol = statusMap.get(stationObjModel.getStationId());
+ if (stationProtocol == null) {
+ continue;
+ }
+
+ if (!stationProtocol.isAutoing()) {
+ continue;
+ }
+
+ if (!stationProtocol.isLoading()) {
+ continue;
+ }
+
+ if (stationProtocol.getTaskNo() <= 0) {
+ continue;
+ }
+
+ if (!stationProtocol.getStationId().equals(stationProtocol.getTargetStaNo())) {
+ continue;
+ }
+
+ WrkMast wrkMast = wrkMastService.selectByWorkNo(stationProtocol.getTaskNo());
+ if (wrkMast == null) {
+ continue;
+ }
+
+ if (Cools.isEmpty(wrkMast.getBatch())) {
+ continue;
+ }
+
+ if (Cools.isEmpty(wrkMast.getBatchSeq())) {
+ continue;
+ }
+
+ List<WrkMast> batchWrkList = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .notIn("wrk_sts", WrkStsType.STATION_RUN_COMPLETE.sts, WrkStsType.COMPLETE_OUTBOUND.sts)
+ .eq("batch", wrkMast.getBatch())
+ .orderBy("batch")
+ );
+ if (batchWrkList.isEmpty()) {
+ continue;
+ }
+ WrkMast firstWrkMast = batchWrkList.get(0);
+ Integer currentBatchSeq = firstWrkMast.getBatchSeq();
+
+ List<NavigateNode> initPath = navigateUtils.calcByStationId(wrkMast.getSourceStaNo(), wrkMast.getStaNo());
+
+ String commandType = "none";
+ Integer seq = getOutStationBatchSeq(initPath, stationProtocol.getStationId(), wrkMast.getBatch());
+ if (seq == null) {
+ if (currentBatchSeq.equals(wrkMast.getBatchSeq())) {
+ commandType = "toTarget";
+ }else {
+ commandType = "toCircle";
+ }
+ }else {
+ seq++;
+ if (seq.equals(wrkMast.getBatchSeq()) && currentBatchSeq.equals(wrkMast.getBatchSeq())) {
+ commandType = "toTarget";
+ }else {
+ commandType = "toCircle";
+ }
+ }
+
+ if (commandType.equals("toTarget")) {
+ StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationProtocol.getStationId(), wrkMast.getStaNo(), 0);
+ if (command == null) {
+ News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
+ continue;
+ }
+ MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
+ News.info("{}浠诲姟鐩存帴鍘荤洰鏍囩偣", wrkMast.getWrkNo());
+ } else if (commandType.equals("toCircle")) {
+ Integer circleTarget = null;
+ for (NavigateNode node : initPath) {
+ JSONObject v = JSONObject.parseObject(node.getNodeValue());
+ if (v != null) {
+ Integer stationId = v.getInteger("stationId");
+ try {
+ List<NavigateNode> enableMovePath = navigateUtils.calcByStationId(stationProtocol.getStationId(), stationId);
+ if (enableMovePath.isEmpty()) {
+ continue;
+ }
+ } catch (Exception e) {
+ continue;
+ }
+
+ circleTarget = stationId;
+ break;
+ }
+ }
+
+ if (circleTarget == null) {
+ continue;
+ }
+
+ StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationProtocol.getStationId(), circleTarget, 0);
+ if (command == null) {
+ News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
+ continue;
+ }
+ MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
+ redisUtil.set(RedisKeyType.WATCH_CIRCLE_STATION_.key + wrkMast.getWrkNo(), JSON.toJSONString(command, SerializerFeature.DisableCircularReferenceDetect), 60 * 60 * 24);
+ News.info("{}浠诲姟杩涜缁曞湀", wrkMast.getWrkNo());
+ }
+ }
+ }
+ }
+
+ // 鐩戞帶缁曞湀绔欑偣
+ public synchronized void watchCircleStation() {
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
+ for (BasDevp basDevp : basDevps) {
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getId());
+ if (stationThread == null) {
+ continue;
+ }
+
+ List<Integer> outOrderList = basDevp.getOutOrderIntList();
+
+ for (StationProtocol stationProtocol : stationThread.getStatus()) {
+ if (!stationProtocol.isAutoing()) {
+ continue;
+ }
+
+ if (!stationProtocol.isLoading()) {
+ continue;
+ }
+
+ if (stationProtocol.getTaskNo() <= 0) {
+ continue;
+ }
+
+ Object circleObj = redisUtil.get(RedisKeyType.WATCH_CIRCLE_STATION_.key + stationProtocol.getTaskNo());
+ if (circleObj == null) {
+ continue;
+ }
+
+ StationCommand circleCommand = JSON.parseObject(circleObj.toString(), StationCommand.class);
+ if (!stationProtocol.getStationId().equals(circleCommand.getTargetStaNo())) {
+ continue;
+ }
+
+ WrkMast wrkMast = wrkMastService.selectByWorkNo(stationProtocol.getTaskNo());
+ if (wrkMast == null) {
+ continue;
+ }
+
+ Integer moveStaNo = wrkMast.getStaNo();
+
+ if (!outOrderList.isEmpty()) {
+ List<NavigateNode> nodes = navigateUtils.calcByStationId(stationProtocol.getStationId(), wrkMast.getStaNo());
+ for (int i = nodes.size() - 1; i >= 0; i--) {
+ NavigateNode node = nodes.get(i);
+ JSONObject v = JSONObject.parseObject(node.getNodeValue());
+ if (v != null) {
+ Integer stationId = v.getInteger("stationId");
+ if (outOrderList.contains(stationId)) {
+ moveStaNo = stationId;
+ break;
+ }
+ }
+ }
+ }
+
+ StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationProtocol.getStationId(), moveStaNo, 0);
+ if (command == null) {
+ News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
+ continue;
+ }
+ MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+ }
+ }
+ }
+
+ public List<Integer> getAllOutOrderList() {
+ List<Integer> list = new ArrayList<>();
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
+ for (BasDevp basDevp : basDevps) {
+ List<Integer> orderList = basDevp.getOutOrderIntList();
+ list.addAll(orderList);
+ }
+ return list;
+ }
+
+ public Integer getOutStationBatchSeq(List<NavigateNode> pathList, Integer searchStationId, String searchBatch) {
+ List<Integer> checkList = new ArrayList<>();
+ for (int i = pathList.size() - 1; i >= 0; i--) {
+ NavigateNode node = pathList.get(i);
+ JSONObject v = JSONObject.parseObject(node.getNodeValue());
+ if (v != null) {
+ Integer stationId = v.getInteger("stationId");
+ if (searchStationId.equals(stationId)) {
+ break;
+ } else {
+ checkList.add(stationId);
+ }
+ }
+ }
+
+ HashMap<String, Integer> batchMap = new HashMap<>();
+ for (Integer station : checkList) {
+ BasStation basStation = basStationService.selectOne(new EntityWrapper<BasStation>().eq("station_id", station));
+ if (basStation == null) {
+ continue;
+ }
+
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basStation.getDeviceNo());
+ if (stationThread == null) {
+ continue;
+ }
+ Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
+ StationProtocol checkStationProtocol = statusMap.get(station);
+ if (checkStationProtocol == null) {
+ continue;
+ }
+ if (checkStationProtocol.getTaskNo() > 0) {
+ WrkMast checkWrkMast = wrkMastService.selectByWorkNo(checkStationProtocol.getTaskNo());
+ if (checkWrkMast == null) {
+ continue;
+ }
+
+ if (!Cools.isEmpty(checkWrkMast.getBatch())) {
+ batchMap.put(checkWrkMast.getBatch(), checkWrkMast.getBatchSeq());
+ }
+ }
+ }
+
+ Integer seq = batchMap.get(searchBatch);
+ return seq;
+ }
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 41ad62e..540bd1c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
# 绯荤粺鐗堟湰淇℃伅
app:
- version: 1.0.4.0
+ version: 1.0.4.1
version-type: dev # prd 鎴� dev
server:
--
Gitblit v1.9.1