From af5081bc0d0668d526a204076557a171097ddb8d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 二月 2026 14:02:59 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into ctu_conveyor
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 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 15614f4..ae8ee1c 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
@@ -1,7 +1,7 @@
package com.zy.acs.manager.core.service;
import com.alibaba.fastjson.JSON;
-import com.zy.acs.common.enums.AgvDirectionType;
+import com.zy.acs.common.enums.ActuatorDirectionType;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.core.constant.MapDataConstant;
import com.zy.acs.manager.core.domain.DirectionDto;
@@ -158,17 +158,10 @@
return angle;
}
- // 鍧愭爣璐ф灦闃堝�� todo:luxiaotao
- public AgvDirectionType calculateAgvWorkDirectionByShelf(Loc loc, Code code) {
+ // 鍧愭爣璐ф灦闃堝��
+ public ActuatorDirectionType calculateAgvWorkDirectionByShelf(Loc loc, Code code) {
Integer compDirect = loc.getCompDirect();
- AgvDirectionType agvDirectionType = null;
- if (compDirect == 0) {
- agvDirectionType = AgvDirectionType.RIGHT;
- }
- if (compDirect == 1) {
- agvDirectionType = AgvDirectionType.LEFT;
- }
- return agvDirectionType;
+ return ActuatorDirectionType.fromVal(compDirect);
}
public Double getStaAngle(Sta sta, Double workDirection) {
--
Gitblit v1.9.1