From 20fa3d6b92c1d03365b8472b1a85bd34d03f9b88 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 06 六月 2025 10:26:55 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 91 ++++++++++++++++++++++++++++++++-------------
1 files changed, 64 insertions(+), 27 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 cc9b0da..27e2d7b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -263,6 +263,8 @@
//鑾峰彇灏忚溅鍙栨斁浠诲姟鍒楄〃澶辫触
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 {
@@ -273,9 +275,19 @@
for (WrkMast wrkMast : wrkMastList) {
if (!Cools.isEmpty(wrkMast)) {
if (siteList.contains(wrkMast.getSourceStaNo())){
+ 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 {
+ continue;
+ }
if (SortTheExecutionOfTheCarUtil.devpNoSortbj(basDevpPositionsListUN, wrkMast.getSourceStaNo(), wrkMast.getStaNo())) {
+ sourceStaNoList.add(wrkMast.getSourceStaNo());
wrkMastlistA.add(wrkMast);
} else {
+ sourceStaNoList.add(wrkMast.getSourceStaNo());
wrkMastlistB.add(wrkMast);
}
}
@@ -453,15 +465,13 @@
// }
// }
public synchronized void taskDown(List<List<List<WrkMast>>> wrkMastListAll) {
+
+ List<Integer> rgvNoM = new ArrayList<>();
+ List<Integer> rgvNoR = new ArrayList<>();
+ int wrkMastRunCount = 0;
+ long devperimeter = 0L;
for (List<List<WrkMast>> wrkMastLists : wrkMastListAll) {
- int wrkMastRunCount = 0;
- int wrkMastCount = 0;
long rgvId = 0;
- for (List<WrkMast> wrkMastList : wrkMastLists) {
- for (WrkMast wrkMast : wrkMastList) {
- wrkMastCount++;
- }
- }
runRgv:
for (List<WrkMast> wrkMastList : wrkMastLists) {
for (WrkMast wrkMast : wrkMastList) {
@@ -493,34 +503,29 @@
BasDevpPosition basDevpPosition = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("dev_no", wrkMast.getSourceStaNo()));
if (basDevpPosition.getPlcPosition()>rgvProtocol.getRgvPos()){
if (basDevpPosition.getPlcPosition()-rgvProtocol.getRgvPos()>taskRunPerimeter){
- if (wrkMastRunCount<wrkMastCount){
- if (rgvProtocol.getStatusType() == RgvStatusType.IDLE) {
- if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(4,null))) {
- log.error("RGV婕父鍚姩鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, "婕父鎸囦护");
- break runRgv;
- }
- wrkMastRunCount++;
+ if (!rgvNoM.contains(rgvProtocol.getRgvNo())){
+ rgvNoM.add(rgvProtocol.getRgvNo());
+ if (wrkMastRunCount == 0){
+ devperimeter = basDevpPosition.getPlcPosition()-taskRunPerimeter+10000>perimeter? 10000:basDevpPosition.getPlcPosition()-taskRunPerimeter+10000;
}
- continue ;
+ wrkMastRunCount++;
+ break;
}
- break runRgv;
+ continue ;
}
} else {
if (rgvProtocol.getRgvPos()+ perimeter -basDevpPosition.getPlcPosition()>taskRunPerimeter){
- if (wrkMastRunCount<wrkMastCount){
- if (rgvProtocol.getStatusType() == RgvStatusType.IDLE) {
- if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(4,null))) {
- log.error("RGV婕父鍚姩鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, "婕父鎸囦护");
- break runRgv;
- }
- wrkMastRunCount++;
+ if (!rgvNoM.contains(rgvProtocol.getRgvNo())){
+ rgvNoM.add(rgvProtocol.getRgvNo());
+ if (wrkMastRunCount == 0){
+ devperimeter = basDevpPosition.getPlcPosition()-taskRunPerimeter+10000>perimeter? 10000:basDevpPosition.getPlcPosition()-taskRunPerimeter+10000;
}
- continue ;
+ wrkMastRunCount++;
+ break;
}
- break runRgv;
+ continue ;
}
}
-
if (rgvProtocol.getStatusType() == RgvStatusType.ROAM) {
double finalVelocity = 0.0; // 鏈�缁堥�熷害 (m/s)
@@ -539,6 +544,11 @@
}
}
+ if (!rgvNoR.contains(rgvProtocol.getRgvNo())){
+ rgvNoR.add(rgvProtocol.getRgvNo());
+ } else {
+ continue ;
+ }
RgvCommand rgvCommand = new RgvCommand();
rgvCommand.setRgvNo(rgvProtocol.getRgvNo());
@@ -563,7 +573,6 @@
wrkMast.setCrnStrTime(now);
try {
wrkMastService.updateById(wrkMast);
- wrkMastCount--;
break;
} catch (Exception e) {
log.error("鏇存柊灏忚溅浠诲姟澶辫触,浠诲姟鍙凤細" + wrkMast.getWrkNo());
@@ -574,6 +583,34 @@
}
}
}
+ try{
+ for (Integer rgvNo : rgvNoM){
+ if (wrkMastRunCount==0){
+ break;
+ }
+ if (rgvNoR.contains(rgvNo)){
+ continue;
+ }
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvNo);
+ RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+ 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))) {
+ log.error("RGV婕父鍚姩鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvNo, "婕父鎸囦护");
+ break;
+ }
+ }
+ }
+ } catch (Exception e){
+
+ }
}
//浠诲姟瀹屾垚
--
Gitblit v1.9.1