From 60edff747d52eb42aadb036e3fbd580252de4c05 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 28 八月 2025 08:15:54 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
index cb00614..5f4df21 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
@@ -12,6 +12,7 @@
import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.entity.Loc;
import com.zy.acs.manager.manager.entity.Segment;
+import com.zy.acs.manager.manager.entity.Sta;
import com.zy.acs.manager.manager.service.ActionService;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.system.service.ConfigService;
@@ -154,7 +155,7 @@
}
// 鍧愭爣璐ф灦闃堝�� todo:luxiaotao
- public AgvDirectionType calculateAgvWorkDirection(Loc loc, Code code) {
+ public AgvDirectionType calculateAgvWorkDirectionByShelf(Loc loc, Code code) {
Integer compDirect = loc.getCompDirect();
AgvDirectionType agvDirectionType = null;
if (compDirect == 0) {
@@ -166,6 +167,19 @@
return agvDirectionType;
}
+ public Double getStaAngle(Sta sta, Double workDirection) {
+ if (null == sta) {
+ return null;
+ }
+ if (Cools.isEmpty(sta.getAngle())) {
+ return workDirection;
+ }
+ return Double.parseDouble(sta.getAngle());
+ }
+
+ public Double calculateAgvWorkDirectionByStation(Double staWorkDirection, Double lastDirection) {
+ return Math.abs(staWorkDirection - lastDirection) + 90.0D;
+ }
public double calculateDistance(double x1, double y1, double x2, double y2) {
double deltaX = x2 - x1;
--
Gitblit v1.9.1