From 0b43055b878416dfc3ac37138d39ae09a1d23364 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期五, 11 四月 2025 16:28:23 +0800
Subject: [PATCH] 1

---
 代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/ElevatorJob.cs |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/ElevatorJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/ElevatorJob.cs"
index b657268..fcb9e57 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/ElevatorJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/ElevatorJob.cs"
@@ -15,7 +15,8 @@
         public Task Execute(IJobExecutionContext context)
         {
             // 浠庝笂涓嬫枃涓幏鍙� JobParams 骞惰浆鎹负 Roast 绫诲瀷
-            CommonElevator elevator = (CommonElevator)context.JobDetail.JobDataMap.Get("JobParams");
+            //CommonElevator elevator = (CommonElevator)context.JobDetail.JobDataMap.Get("JobParams");
+            CommonRoast elevator = (CommonRoast)context.JobDetail.JobDataMap.Get("JobParams");
             // 鍒濆鍖� AGV 鍙橀噺
             AGV agv = null;
 
@@ -26,7 +27,7 @@
 
             // 杩炴帴 AGV
             // 鏍规嵁璁惧鍚嶇О鍐冲畾鏄鏋佽繕鏄礋鏋� AGV
-            List<string> agvNames = new List<string>() { "姝f瀬AGV", "璐熸瀬AGV" };
+            List<string> agvNames = new List<string>() {  "璐熸瀬AGV" }; //"姝f瀬AGV",
             foreach (var agvName in agvNames)
             {
                 // 浠庡瓨鍌ㄤ腑鏌ユ壘鎸囧畾鍚嶇О鐨勮澶�
@@ -48,7 +49,7 @@
         }
 
 
-        public static void DeviceInteraction(CommonElevator elevator, AGV agv, List<string> elevatorNames, List<string> agvNames)
+        public static void DeviceInteraction(CommonRoast elevator, AGV agv, List<string> elevatorNames, List<string> agvNames)
         {
             if (agv.DeviceName == "姝f瀬AGV")
             {
@@ -60,11 +61,12 @@
             }
         }
 
-        private static void HandlePositiveAGV(CommonElevator elevator, AGV agv, List<string> elevatorNames, List<string> agvNames)
+        private static void HandlePositiveAGV(CommonRoast elevator, AGV agv, List<string> elevatorNames, List<string> agvNames)
         {
             // 姝f瀬AGV鍙渶瑕佸鐞嗗墠涓や釜淇″彿
-            var elevatorSignal = elevator.Communicator.Read<byte>(elevatorNames[0], 100);
-            var agvSignal = agv.Communicator.Read<byte>(agvNames[1], 100);
+            // 淇敼璇诲彇鏂瑰紡锛岀‘淇濊幏鍙栫涓�涓瓧鑺�
+            var elevatorSignal = elevator.Communicator.Read<byte[]>(elevatorNames[0], 100)[0];
+            var agvSignal = agv.Communicator.Read<byte[]>(agvNames[1], 100)[0];
 
             agv.Communicator.Write(agvNames[0], elevatorSignal);
             elevator.Communicator.Write(agvNames[1], agvSignal);
@@ -73,7 +75,7 @@
                                        $"鍐欏叆AGV淇″彿[{agvSignal}]鍒皗agvNames[1]}");
         }
 
-        private static void HandleNegativeAGV(CommonElevator elevator, AGV agv, List<string> elevatorNames, List<string> agvNames)
+        private static void HandleNegativeAGV(CommonRoast elevator, AGV agv, List<string> elevatorNames, List<string> agvNames)
         {
             // 瀹氫箟淇″彿缁勫鐞嗭紙璧峰绱㈠紩锛屾搷浣滅被鍨嬶紝鏃ュ織鎻忚堪锛�
             var operations = new List<(int startIdx, string type, string desc)>
@@ -104,7 +106,7 @@
             }
         }
 
-        private static void ProcessSignalGroup(CommonElevator elevator, AGV agv, List<string> elevatorNames, List<string> agvNames, int startIdx, string operationType, string description)
+        private static void ProcessSignalGroup(CommonRoast elevator, AGV agv, List<string> elevatorNames, List<string> agvNames, int startIdx, string operationType, string description)
         {
             const int GROUP_SIZE = 2; // 姣忕粍澶勭悊2涓俊鍙�
 
@@ -154,7 +156,7 @@
             ConsoleHelper.WriteInfoLine($"璐熸瀬AGV浜や簰({description}): 浼犺緭淇″彿缁刐{logValues}]鍒扮洰鏍囧湴鍧�[{logTargets}]");
         }
 
-        private static void HandleSpecialSignals(CommonElevator elevator, AGV agv,
+        private static void HandleSpecialSignals(CommonRoast elevator, AGV agv,
                                                 List<string> elevatorNames, List<string> agvNames,
                                                 int startIdx)
         {

--
Gitblit v1.9.3