From 0939aa5f3cc12a8856456a51cf2b661b6cd780c7 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 31 七月 2025 17:25:49 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DeviceInfoService.cs | 61 ++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 17 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DeviceInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DeviceInfoService.cs"
index b01298a..cb98ede 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DeviceInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DeviceInfoService.cs"
@@ -89,7 +89,7 @@
string[] sourceCodes = stackerhand.SourceAddress.Split("-");
if (sourceCodes.Length == 3)
{
- stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(sourceCodes[0]);
+ stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
}
@@ -101,7 +101,7 @@
string[] targetCodes = stackerhand.TargetAddress.Split("-");
if (targetCodes.Length == 3)
{
- stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(targetCodes[0]);
+ stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
}
@@ -116,7 +116,7 @@
string[] sourceCodes = stackerhand.SourceAddress.Split("-");
if (sourceCodes.Length == 3)
{
- stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(sourceCodes[0]);
+ stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
}
@@ -127,7 +127,7 @@
string[] targetCodes = stackerhand.TargetAddress.Split("-");
if (targetCodes.Length == 3)
{
- stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(targetCodes[0]);
+ stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
}
@@ -142,7 +142,7 @@
string[] sourceCodes = stackerhand.SourceAddress.Split("-");
if (sourceCodes.Length == 3)
{
- stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(sourceCodes[0]);
+ stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
}
@@ -154,7 +154,7 @@
string[] targetCodes = stackerhand.TargetAddress.Split("-");
if (targetCodes.Length == 3)
{
- stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(targetCodes[0]);
+ stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
}
@@ -169,7 +169,7 @@
string[] sourceCodes = stackerhand.SourceAddress.Split("-");
if (sourceCodes.Length == 3)
{
- stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(sourceCodes[0]);
+ stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
@@ -192,7 +192,7 @@
stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(0);
stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(0);
- stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(targetCodes[0]);
+ stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
}
@@ -305,7 +305,29 @@
}
}
-
+ public int GetRowCode(int number)
+ {
+ if (number == 1 || number == 15 || number == 11 || number == 19)
+ {
+ return 1;
+ }
+ else if (number == 2 || number == 5 || number == 8 || number == 12 || number == 16 || number == 20)
+ {
+ return 2;
+ }
+ else if (number == 3 || number == 6 || number == 9 || number == 13 || number == 17 || number == 21)
+ {
+ return 3;
+ }
+ else if (number == 4 || number == 7 || number == 10 || number == 14 || number == 18 || number == 22)
+ {
+ return 4;
+ }
+ else
+ {
+ throw new ArgumentOutOfRangeException(nameof(number), "杈撳叆鐨勬暟瀛楀繀椤诲湪1-16鑼冨洿鍐�");
+ }
+ }
public class StackerCraneTaskCommand
{
#region <Public Menber>
@@ -495,10 +517,10 @@
if (device != null)
{
CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
- ushort x = conveyorLine.GetValue<ConveyorLineDBName, ushort>(ConveyorLineDBName.InteractiveSignal, stationManager.stationChildCode);
+ short x = conveyorLine.GetValue<ConveyorLineDBName, short>(ConveyorLineDBName.InteractiveSignal, stationManager.stationChildCode);
var structs = BitConverter.GetBytes(x).ToArray().ToBoolArray();
short ConveyorLineTaskNum = conveyorLine.GetValue<ConveyorLineDBName, short>(ConveyorLineDBName.ConveyorLineTaskNum, stationManager.stationChildCode);
- int ConveyorLineAlarm = conveyorLine.GetValue<ConveyorLineDBName, int>(ConveyorLineDBName.ConveyorLineAlarm, stationManager.stationChildCode);
+ uint ConveyorLineAlarm = conveyorLine.GetValue<ConveyorLineDBName, uint>(ConveyorLineDBName.ConveyorLineAlarm, stationManager.stationChildCode);
ConveyorLineTaskCommand obj = new()
{
InStock = structs[2] == true ? "鏈夎揣" : "绌洪棽",
@@ -683,7 +705,7 @@
}
}
- string AlarmInfo(int Alarm) => Alarm switch
+ string AlarmInfo(uint Alarm) => Alarm switch
{
0 => "鎬ュ仠",
1 => "鍙橀鍣ㄦ姤璀�1",
@@ -835,7 +857,7 @@
RGVTaskCommand command = new RGVTaskCommand()
{
PutcargoLocation = (byte)Convert.ToSByte(RGVhand.TargetAddress),
- TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
+ TaskType = (byte)Convert.ToSByte(4),
};
SendCommandFirstFloor(RGVcommand, command);
return content.OK($"{device.DeviceName}閫�鍛戒护涓嬪彂鎴愬姛");
@@ -1037,12 +1059,12 @@
if (DeviceCode == "RGV01" || DeviceCode == "RGV02")
{
CommonRGV_FirstFloor commonRGV = (CommonRGV_FirstFloor)device;
- commonRGV.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(9));
+ commonRGV.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(7));
}
else
{
CommonRGV commonRGV = (CommonRGV)device;
- commonRGV.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(9));
+ commonRGV.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(7));
}
return content.OK($"{device.DeviceName}涓柇鎴愬姛");
}
@@ -1061,15 +1083,20 @@
IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == DeviceCode);
if (device != null)
{
+
if (DeviceCode == "RGV01" || DeviceCode == "RGV02")
{
CommonRGV_FirstFloor commonRGV = (CommonRGV_FirstFloor)device;
- commonRGV.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(9));
+ DeviceProDTO? devicePro = commonRGV.DeviceProDTOs.Where(x => x.DeviceChildCode == commonRGV.DeviceCode && x.DeviceProParamName == "TaskType").FirstOrDefault();
+ byte[] byt = Encoding.UTF8.GetBytes("08");
+ commonRGV.Communicator.Write(devicePro.DeviceProAddress, byt);
}
else
{
CommonRGV commonRGV = (CommonRGV)device;
- commonRGV.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(9));
+ DeviceProDTO? devicePro = commonRGV.DeviceProDTOs.Where(x => x.DeviceChildCode == commonRGV.DeviceCode && x.DeviceProParamName == "TaskType").FirstOrDefault();
+ byte[] byt = Encoding.UTF8.GetBytes("8");
+ commonRGV.Communicator.Write(devicePro.DeviceProAddress, byt);
}
return content.OK($"{device.DeviceName}鍒濆鍖栨垚鍔�");
}
--
Gitblit v1.9.3