From b050b0ef27649165992c264f63042d339d86a4f3 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期二, 03 二月 2026 16:22:10 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 96 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 93 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 52e7a36..c0730c2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -703,11 +703,12 @@
} else {
staProtocol = staProtocol.clone();
}
- if (!staProtocol.isAutoing() || staProtocol.isLoading()) {
+ if (!staProtocol.isAutoing() || !staProtocol.isLoading()) {
continue;
}
TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnProtocol.getLaneNo(), staDesc.getStnNo().toString());
if (taskWrk == null) {
+ log.info("鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯锛氭湭鏌ヨ鍒扮姸鎬佷负13鐨勪换鍔′俊鎭紝绔欑偣鍙�:" + staDesc.getStnNo().toString());
continue;
}
if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0 || staProtocol.getWorkNo().equals(taskWrk.getWrkNo()))) {
@@ -727,7 +728,11 @@
if (offer) {
log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:" + JSON.toJSONString(taskWrk));
Date now = new Date();
- taskWrk.setStatus(TaskStatusType.OVER3.id);
+ if (taskWrk.getTargetPoint().equals(staProtocol.getSiteId().toString())){
+ taskWrk.setStatus(TaskStatusType.OVER.id);
+ } else {
+ taskWrk.setStatus(TaskStatusType.OVER3.id);
+ }
taskWrk.setWrkSts(14);
taskWrk.setModiTime(now);
taskWrk.setCompleteTime(now);
@@ -1764,7 +1769,7 @@
ConcurrentHashMap<String, TaskProtocol> allTaskProtocol = taskProtocolCache.getAllTaskProtocol();
if (!allTaskProtocol.isEmpty()) {
for (TaskProtocol taskProtocol : allTaskProtocol.values()) {
- if (taskProtocol.getTaskNo() != 0) {
+ if (taskProtocol.getTaskNo() != 0 && taskProtocol.getTaskNo()!=32222L) {
return taskProtocol.getTaskNo().toString();
}
}
@@ -2464,10 +2469,90 @@
ArrayList<Long[]> arrayListAll = new ArrayList<>();
for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
try{
+ boolean itSmall = new TrackRangeUtils().IsItSmall(rgvSlave);
String taskNoNow = rgvOtherTaskWrk(rgvSlave);
+ if (taskNoNow.equals("鏃�")){
+ continue;
+ }
if (!arrayListOld.contains(taskNoNow)){
arrayListOld.add(taskNoNow);
}
+
+ TaskWrk taskWrk = taskWrkMapper.selectByTaskNo(taskNoNow);
+ if (taskWrk != null) {
+ if (!arrayListAllP.contains(taskWrk.getWrkNo())) {
+
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
+ TaskProtocolCache taskProtocolCache = rgvThread.getTaskProtocolCache();
+
+ arrayListAllP.add(taskWrk.getWrkNo());
+ long startP = 0;
+ if (!itSmall){
+ startP = System.currentTimeMillis();
+ }
+
+ long endP = 0;
+ long endP1 = 0;
+ long endP2 = 0;
+ ConcurrentHashMap<String, TaskProtocol> allTaskProtocol = taskProtocolCache.getAllTaskProtocol();
+ for (TaskProtocol taskProtocol : allTaskProtocol.values()){
+ if (taskProtocol.getTaskStatus() == 2){//鍙�
+ endP1 = taskProtocol.getTargetPosition();
+ } else if (taskProtocol.getTaskStatus() == 3){//鏀�
+ endP2 = taskProtocol.getTargetPosition();
+ }
+ }
+ if (endP1 > endP2){
+ if (itSmall){
+ endP = endP1;
+ } else {
+ endP = endP2;
+ }
+ }
+ if (endP == 0){
+ if (itSmall){
+ endP = System.currentTimeMillis();
+ }
+ }
+ Long[] longList = {taskWrk.getWrkNo().longValue(),startP,endP};
+ arrayListAll.add(longList);
+ }
+ } else {
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
+ TaskProtocolCache taskProtocolCache = rgvThread.getTaskProtocolCache();
+
+ try {
+ long startP = 0;
+ long endP = 0;
+ ConcurrentHashMap<String, TaskProtocol> allTaskProtocol = taskProtocolCache.getAllTaskProtocol();
+ for (TaskProtocol taskProtocol : allTaskProtocol.values()){
+ if (taskProtocol.getTaskStatus() == 2){//鍙�
+ startP = taskProtocol.getTargetPosition();
+ } else if (taskProtocol.getTaskStatus() == 3){//鏀�
+ endP = taskProtocol.getTargetPosition();
+ }
+ }
+ if (startP == 0 ){
+ if (!itSmall){
+ startP = System.currentTimeMillis();
+ }
+ }
+ if (endP == 0){
+ if (itSmall){
+ endP = System.currentTimeMillis();
+ }
+ }
+// taskNoNow
+ long parseLong = Long.parseLong(taskNoNow);
+ Long[] longList = {parseLong,startP,endP};
+ arrayListAll.add(longList);
+
+ } catch (Exception e) {
+ log.error("浠诲姟杩囨护鏌ヨ灏忚溅鎵ц浠诲姟寮傚父锛�"+e.getMessage());
+ return new ArrayList<>();
+ }
+ }
+
} catch (Exception e) {
}
}
@@ -2491,6 +2576,11 @@
List<Long> wrkNoList = new ArrayList<>();
List<Long> signWrk = new ArrayList<>();
for (Long[] longList : crossingPathsW) {
+ if (arrayListOld.contains(longList[0].toString()) || arrayListOld.contains(longList[1].toString())){
+ signWrk.add(longList[0]);
+ signWrk.add(longList[1]);
+ continue;
+ }
if (!wrkNoList.contains(longList[0]) && !signWrk.contains(longList[0])) {
if (!wrkNoList.contains(longList[1]) && !signWrk.contains(longList[1])) {
wrkNoList.add(longList[0]);
--
Gitblit v1.9.1