From f9ebacd189cf3800616e33d8ee24a0be1fc58a39 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期六, 07 二月 2026 13:19:53 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index 495193d..7597586 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -1253,9 +1253,9 @@
case ORI_STA:
// 绔欑偣鍙栬揣
Sta oriSta = staService.getById(task.getOriSta());
- Double oriStaWorkDirection = mapService.getStaAngle(oriSta, workDirection);
+ Double angle = oriSta.getAngle() == null ? mapService.getStaAngle(oriSta, workDirection) : Double.valueOf(oriSta.getAngle());
// 妫�楠屾柟鍚�
- if (!lastDirection.equals(oriStaWorkDirection)) {
+ if (!lastDirection.equals(Double.valueOf(angle))) {
if (!lastCode.getCornerBool()) {
throw new CoolException(agvNo + "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
}
@@ -1267,15 +1267,15 @@
null, // 鍔ㄤ綔鍙�
null, // 浼樺厛绾�
ActionTypeType.TurnCorner.desc, // 鍚嶇О
- (double) MapService.calcSpinDirection(lastCode, lastDirection, oriStaWorkDirection).val, // 灞炴�у��
+ (double) MapService.calcSpinDirection(lastCode, lastDirection, angle).val, // 灞炴�у��
lastCode.getData(), // 鍦伴潰鐮�
- String.valueOf(oriStaWorkDirection), // 鍔ㄤ綔鍙傛暟
+ String.valueOf(angle), // 鍔ㄤ綔鍙傛暟
ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
actionPrepareSts, // 鍔ㄤ綔杩涘害
agvId, // AGV
now // 宸ヤ綔鏃堕棿
));
- lastDirection = oriStaWorkDirection;
+ lastDirection = angle;
}
// 璁＄畻璐у弶宸ヤ綔鏂瑰悜
actuatorDirectionType = ActuatorDirectionType.fromVal(oriSta.getActDir());
@@ -1318,9 +1318,9 @@
case DEST_STA:
// 绔欑偣鏀捐揣
Sta destSta = staService.getById(task.getDestSta());
- Double destStaWorkDirection = mapService.getStaAngle(destSta, workDirection);
+ angle = destSta.getAngle() == null ? mapService.getStaAngle(destSta, workDirection) : Double.valueOf(destSta.getAngle());
// 妫�楠屾柟鍚�
- if (!lastDirection.equals(destStaWorkDirection)) {
+ if (!lastDirection.equals(angle)) {
if (!lastCode.getCornerBool()) {
throw new CoolException(agvNo + "鍙峰皬杞︽柟鍚戦敊璇紝璇锋帹鑷宠浆寮偣鎵嬪姩璋冩暣");
}
@@ -1332,15 +1332,15 @@
null, // 鍔ㄤ綔鍙�
null, // 浼樺厛绾�
ActionTypeType.TurnCorner.desc, // 鍚嶇О
- (double) MapService.calcSpinDirection(lastCode, lastDirection, destStaWorkDirection).val, // 灞炴�у��
+ (double) MapService.calcSpinDirection(lastCode, lastDirection, angle).val, // 灞炴�у��
lastCode.getData(), // 鍦伴潰鐮�
- String.valueOf(destStaWorkDirection), // 鍔ㄤ綔鍙傛暟
+ String.valueOf(angle), // 鍔ㄤ綔鍙傛暟
ActionTypeType.TurnCorner.val(), // 鍔ㄤ綔绫诲瀷
actionPrepareSts, // 鍔ㄤ綔杩涘害
agvId, // AGV
now // 宸ヤ綔鏃堕棿
));
- lastDirection = destStaWorkDirection;
+ lastDirection = angle;
}
// 鑳岀瘬鍙栬揣
if (backupAction) {
--
Gitblit v1.9.1