From 3cf675aca4c8e58d180595d1f417d97158f064bf Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期四, 24 七月 2025 21:07:44 +0800
Subject: [PATCH] rgv取空托调度优化
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 5af3687..e6ceeec 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -433,6 +433,25 @@
wrkMast.setRgvCreateTime(now);
wrkMastService.updateById(wrkMast);
break runRgv;
+ } else if(rgvProtocol.modeType == RgvModeType.AUTO
+ && (rgvProtocol.getStatusType() == RgvStatusType.IDLE || rgvProtocol.getStatusType() == RgvStatusType.ROAM)
+ && rgvProtocol.getTaskNo1() != 0
+ && rgvProtocol.getAlarm() == 0){ // 褰撳墠灏忚溅鏀捐揣鐩爣浣嶇疆鍦ㄥ綋鍓嶄换鍔″彇璐х偣涔嬪悗锛岃烦杩囦换鍔″垎閰嶏紝涓嶅啀鍒欏垽鏂笅涓皬杞︾洰鏍囦綅缃�
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", rgvProtocol.getTaskNo1())); // 褰撳墠rgv浠诲姟
+ if(wrkMast1!= null && !Cools.isEmpty(wrkMast1.getRgvDstaNo())) {
+ // 褰撳墠rgv浠诲姟鐩爣绔欑偣
+ BasDevpPosition rgvDstaNoDevPosition = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("dev_no", wrkMast1.getRgvDstaNo()));
+ long rgvDstaNoPosition = rgvDstaNoDevPosition.getPlcPosition(); // 褰撳墠rgv浠诲姟鐩爣绔欑偣浣嶇疆
+ if(rgvProtocol.getRgvPos() < rgvDstaNoPosition) { // 灏忚溅褰撳墠浣嶇疆 < rgv鐩爣浣嶇疆
+ if(rgvProtocol.getRgvPos() < position && position < rgvDstaNoPosition) { // 杩欎釜浠诲姟浣嶇疆鏄湪褰撳墠rgv浣嶇疆鍓嶉潰骞朵笖杩欎釜浠诲姟璧风偣鍦ㄥ綋鍓峳gv鐩爣绔欑偣涔嬪悗
+ break; // 褰撳墠rgv鏀捐揣瀹屾垚鍚庯紝鍙互鍙栧綋鍓嶄换鍔�
+ }
+ } else {
+ if(rgvProtocol.getRgvPos() < position || position < rgvDstaNoPosition) {
+ break;
+ }
+ }
+ }
}
} else {
if (count != 0) {
--
Gitblit v1.9.1