From 1d2d03dbbcc8ba01029514ec5b2e39646c180c15 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 13 六月 2025 09:20:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 38 +++++++++++++-------------------------
1 files changed, 13 insertions(+), 25 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 fa08fbd..5a437a4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1848,28 +1848,6 @@
}
}
- sign = true;
-
- if (sign){
- for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvInSta()) {
- if (rgvStn.getStaNo().equals(staList.get(0))) {
- TaskWrk taskWrk = deviceDetection(rgvStn);
- if (taskWrk != null) {
- Integer outStaNo = BarcodeUtils.getOutStaNo(taskWrk.getOriginTargetPoint());
- for (RgvSlave.RgvStn rgvSuper : rgvSlave.getRgvSuperSta()){
- if (rgvSuper.getStaNo().equals(outStaNo)){
- System.out.println("鍥犳渶杩滄墽琛屽崐杈瑰尯鍩熷唴鏀捐揣浠诲姟==="+rgvSlave.getId()+"===");
- sign=false;
- break;
- }
- }
- } else {
- return;
- }
- break;
- }
- }
- }
if (!sign) {
// 鍗婅竟鍖哄煙鍐呮斁璐т换鍔�
for (Integer staNoNow : rangeListOther) {
@@ -1877,13 +1855,23 @@
if (rgvStn.getStaNo().equals(staNoNow)) {
TaskWrk taskWrk = deviceDetection(rgvStn);
if (taskWrk != null) {
- BasDevpPosition basDevpPosition = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("DEV_NO", BarcodeUtils.getOutStaNo(taskWrk.getOriginTargetPoint())));
- if (RouteUtils.CheckIfItIsWithinTheRange(rangeList, basDevpPosition.getPlcPosition(), basDevpPositions, itSmall)) {
- sign = taskGenerate(rgvSlave, rgvStn, 0);
+ Integer outStaNo = BarcodeUtils.getOutStaNo(taskWrk.getOriginTargetPoint());
+ for (RgvSlave.RgvStn rgvSuper : rgvSlave.getRgvSuperSta()){
+ if (rgvSuper.getStaNo().equals(outStaNo)){
+ System.out.println("鍥犳渶杩滄墽琛屽崐杈瑰尯鍩熷唴鏀捐揣浠诲姟==="+rgvSlave.getId()+"===");
+ BasDevpPosition basDevpPosition = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("DEV_NO", BarcodeUtils.getOutStaNo(taskWrk.getOriginTargetPoint())));
+ if (RouteUtils.CheckIfItIsWithinTheRange(rangeList, basDevpPosition.getPlcPosition(), basDevpPositions, itSmall)) {
+ sign = taskGenerate(rgvSlave, rgvStn, 0);
+ }
+ break;
+ }
}
}
break;
}
+ if (sign) {
+ break;
+ }
}
if (sign) {
break;
--
Gitblit v1.9.1