From b3c2c6fa1fc80d7cd7e47bacf221157bb3d0e60c Mon Sep 17 00:00:00 2001
From: hmpc <hmpc>
Date: 星期一, 13 一月 2025 09:04:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 +++-
src/main/resources/application.yml | 2 ++
2 files changed, 5 insertions(+), 1 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 9eb97ab..c67ba24 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -57,6 +57,8 @@
private Long acceleration;
@Value("${constant-parameters.rgvCount}")
private Long rgvCount;
+ @Value("${constant-parameters.rgvDate}")
+ private Double rgvDate;
/**
* 绔欑偣浠诲姟妫�娴� 鏇存柊灏忚溅浣嶇疆淇℃伅
*/
@@ -289,7 +291,7 @@
double finalVelocity = 0.0; // 鏈�缁堥�熷害 (m/s)
double distance = (Math.pow(finalVelocity, 2) - Math.pow(rgvProtocol.instantaneousSpeed/60, 2)) / (2 * acceleration);
BasDevpPosition basDevpPosition = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("dev_no", wrkMast.getSourceStaNo()));
- if (distance*proportion > ((SortTheExecutionOfTheCarUtil.LatelyAndLessThan(basDevpPosition.getPlcPosition(),rgvProtocol.getRgvPos(),perimeter) + (rgvProtocol.instantaneousSpeed/60)*proportion*0.2))){
+ if (distance*proportion > ((SortTheExecutionOfTheCarUtil.LatelyAndLessThan(basDevpPosition.getPlcPosition(),rgvProtocol.getRgvPos(),perimeter) + (rgvProtocol.instantaneousSpeed/60)*proportion*rgvDate))){
continue ;
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8c6ac9e..8d175f6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -41,6 +41,8 @@
acceleration: -2
# 灏忚溅鏁�
rgvCount: 10
+ # 寤惰繜鏃堕棿
+ rgvDate: 0.5
# 涓嬩綅鏈洪厤缃�
wcs-slave:
--
Gitblit v1.9.1