From 83023a878d2f54a6abf6524aa49eeca13a774341 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 06 六月 2025 13:17:56 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 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 06ab983..9841de2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -234,7 +234,7 @@
return;
}
long differenceInSeconds = TimeCalculatorUtils.differenceInMilliseconds(wrkMasts.get(0).getModiTime(), new Date());
- if (differenceInSeconds <= 100) {
+ if (differenceInSeconds <= 1000) {
return;
}
@@ -263,20 +263,44 @@
//鑾峰彇灏忚溅鍙栨斁浠诲姟鍒楄〃澶辫触
public synchronized List<List<List<WrkMast>>> getWrkMastListAll(List<List<Integer>> siteListAll ,BasDevpPosition[] basDevpPositionsListUN) {
List<List<List<WrkMast>>> wrkMastListAll = new ArrayList<>();
+ List<Integer> sourceStaNoList = new ArrayList<>();
+
for (List<Integer> siteList : siteListAll){
List<List<WrkMast>> wrkMastLists = new ArrayList<>();
try {
List<WrkMast> wrkMastlistA = new ArrayList<>();
List<WrkMast> wrkMastlistB = new ArrayList<>();
+ List<WrkMast> wrkMastlistC = new ArrayList<>();
+ List<WrkMast> wrkMastlistD = new ArrayList<>();
for (BasDevpPosition basDevpPosition : basDevpPositionsListUN) {
List<WrkMast> wrkMastList = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", basDevpPosition.getDevNo()).eq("wrk_sts", 1L).orderBy("modi_time", true));
for (WrkMast wrkMast : wrkMastList) {
if (!Cools.isEmpty(wrkMast)) {
if (siteList.contains(wrkMast.getSourceStaNo())){
- if (SortTheExecutionOfTheCarUtil.devpNoSortbj(basDevpPositionsListUN, wrkMast.getSourceStaNo(), wrkMast.getStaNo())) {
- wrkMastlistA.add(wrkMast);
+ if (!sourceStaNoList.contains(wrkMast.getSourceStaNo())){
+ List<WrkMast> wrkMastListS = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("source_sta_no", wrkMast.getSourceStaNo()).eq("wrk_sts", 1L).orderBy("modi_time", true));
+ if (wrkMastListS.isEmpty()){
+ continue;
+ }
} else {
- wrkMastlistB.add(wrkMast);
+ continue;
+ }
+ long differenceInSeconds = TimeCalculatorUtils.differenceInMilliseconds(wrkMast.getModiTime(), new Date());
+
+ if (SortTheExecutionOfTheCarUtil.devpNoSortbj(basDevpPositionsListUN, wrkMast.getSourceStaNo(), wrkMast.getStaNo())) {
+ sourceStaNoList.add(wrkMast.getSourceStaNo());
+ if (differenceInSeconds>600000){
+ wrkMastlistA.add(wrkMast);
+ } else {
+ wrkMastlistC.add(wrkMast);
+ }
+ } else {
+ sourceStaNoList.add(wrkMast.getSourceStaNo());
+ if (differenceInSeconds>600000){
+ wrkMastlistB.add(wrkMast);
+ } else {
+ wrkMastlistD.add(wrkMast);
+ }
}
}
}
@@ -284,6 +308,8 @@
}
wrkMastLists.add(wrkMastlistA);
wrkMastLists.add(wrkMastlistB);
+ wrkMastLists.add(wrkMastlistC);
+ wrkMastLists.add(wrkMastlistD);
// return wrkMastLists;
wrkMastListAll.add(wrkMastLists);
} catch (Exception e) {
@@ -456,8 +482,8 @@
List<Integer> rgvNoM = new ArrayList<>();
List<Integer> rgvNoR = new ArrayList<>();
- Integer wrkMastRunCount = 0;
- Long devperimeter = 0L;
+ int wrkMastRunCount = 0;
+ long devperimeter = 0L;
for (List<List<WrkMast>> wrkMastLists : wrkMastListAll) {
long rgvId = 0;
runRgv:
@@ -493,6 +519,9 @@
if (basDevpPosition.getPlcPosition()-rgvProtocol.getRgvPos()>taskRunPerimeter){
if (!rgvNoM.contains(rgvProtocol.getRgvNo())){
rgvNoM.add(rgvProtocol.getRgvNo());
+ if (wrkMastRunCount == 0){
+ devperimeter = basDevpPosition.getPlcPosition()-taskRunPerimeter+10000>perimeter? 10000:basDevpPosition.getPlcPosition()-taskRunPerimeter+10000;
+ }
wrkMastRunCount++;
break;
}
@@ -502,6 +531,9 @@
if (rgvProtocol.getRgvPos()+ perimeter -basDevpPosition.getPlcPosition()>taskRunPerimeter){
if (!rgvNoM.contains(rgvProtocol.getRgvNo())){
rgvNoM.add(rgvProtocol.getRgvNo());
+ if (wrkMastRunCount == 0){
+ devperimeter = basDevpPosition.getPlcPosition()-taskRunPerimeter+10000>perimeter? 10000:basDevpPosition.getPlcPosition()-taskRunPerimeter+10000;
+ }
wrkMastRunCount++;
break;
}
@@ -578,17 +610,16 @@
if (rgvProtocol == null) {
continue;
}
-
+ wrkMastRunCount--;
if (rgvProtocol != null
&& rgvProtocol.modeType == RgvModeType.AUTO
&& rgvProtocol.getStatusType() == RgvStatusType.IDLE
&& rgvProtocol.getTaskNo1() == 0
&& rgvProtocol.getAlarm() == 0) {
- if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(4,devperimeter))) {
+ if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(5,devperimeter))) {
log.error("RGV婕父鍚姩鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvNo, "婕父鎸囦护");
break;
}
- wrkMastRunCount--;
}
}
} catch (Exception e){
@@ -644,7 +675,7 @@
wrkMastService.updateById(wrkMast);
continue;
}else {
- log.error("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"浠诲姟瀹屾垚淇℃伅涓婁紶澶勭悊澶辫触");
+ log.error("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"浠诲姟瀹屾垚淇℃伅涓婁紶澶勭悊澶辫触1");
}
} else {
//娴嬭瘯鐢�
--
Gitblit v1.9.1