From 0784c98220306a87a6017bfa114e2a9c0e91c31c Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期五, 11 四月 2025 16:29:23 +0800
Subject: [PATCH] 1
---
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/ElevatorJob.cs | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 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..05fbea8 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>() { "姝ｆ瀬AGV", "璐熸瀬AGV" };
+ List<string> agvNames = new List<string>() { "璐熸瀬AGV" }; //"姝ｆ瀬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 == "姝ｆ瀬AGV")
{
@@ -60,11 +61,11 @@
}
}
- 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)
{
// 姝ｆ瀬AGV鍙渶瑕佸鐞嗗墠涓や釜淇″彿
- var elevatorSignal = elevator.Communicator.Read<byte>(elevatorNames[0], 100);
- var agvSignal = agv.Communicator.Read<byte>(agvNames[1], 100);
+ var elevatorSignal = elevator.Communicator.Read(elevatorNames[0], 100);
+ var agvSignal = agv.Communicator.Read(agvNames[1], 100);
agv.Communicator.Write(agvNames[0], elevatorSignal);
elevator.Communicator.Write(agvNames[1], agvSignal);
@@ -73,7 +74,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 +105,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涓俊鍙�
@@ -126,7 +127,7 @@
int idx = startIdx + i;
if (idx >= elevatorNames.Count) break;
- var value = elevator.Communicator.Read<byte>(elevatorNames[idx], 100);
+ var value = elevator.Communicator.Read(elevatorNames[idx], 100);
agv.Communicator.Write(agvNames[idx], value);
values.Add(value);
targets.Add(agvNames[idx]);
@@ -140,7 +141,7 @@
int idx = startIdx + i;
if (idx >= agvNames.Count) break;
- var value = agv.Communicator.Read<byte>(agvNames[idx], 100);
+ var value = agv.Communicator.Read(agvNames[idx], 100);
elevator.Communicator.Write(elevatorNames[idx], value);
values.Add(value);
targets.Add(elevatorNames[idx]);
@@ -154,13 +155,13 @@
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)
{
// 澶勭悊18-21鍙风數姊俊鍙凤紙4涓俊鍙凤級
var elevatorSignals = Enumerable.Range(18, 4)
- .Select(i => elevator.Communicator.Read<byte>(elevatorNames[i], 100))
+ .Select(i => elevator.Communicator.Read(elevatorNames[i], 100))
.ToList();
for (int i = 0; i < 4; i++)
@@ -170,7 +171,7 @@
// 澶勭悊22-23鍙稟GV淇″彿
var agvSignals = Enumerable.Range(22, 2)
- .Select(i => agv.Communicator.Read<byte>(agvNames[i], 100))
+ .Select(i => agv.Communicator.Read(agvNames[i], 100))
.ToList();
for (int i = 0; i < 2; i++)
--
Gitblit v1.9.3