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_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 73 +++++++++++++++++++++++++++++++++---
1 files changed, 67 insertions(+), 6 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 6966f3b..4045cd2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -122,6 +122,41 @@
true => "鏁呴殰",
false => "姝ｅ父",
};
+ string StackerCraneAlarm(uint alarm) => alarm switch
+ {
+ 0 => "鎸囦护鎴栧湴鍧�閿欒",
+ 1 => "鎬ュ仠",
+ 2 => "鍏夐�氳涓柇",
+ 3 => "缁勬�佸け鑱�",
+ 4 => "琛岃蛋鍙橀鏁呴殰",
+ 5 => "琛岃蛋鏋侀檺瑙﹀彂",
+ 6 => "琛岃蛋杩愯瓒呮椂",
+ 7 => "鎻愬崌鍙橀鏁呴殰",
+ 8 => "鎻愬崌鏋侀檺瑙﹀彂",
+ 9 => "鎻愬崌杩愯瓒呮椂",
+ 10 => "杞借揣鍙拌秴杞�",
+ 11 => "杞借揣鍙版瑺杞斤紙鏉剧怀)",
+ 12 => "杞借揣鍙板け閫�",
+ 13 => "璐у弶鍙橀鎶ヨ",
+ 14 => "璐у弶杩愯瓒呮椂",
+ 15 => "璐у弶鏋侀檺瑙﹀彂",
+ 16 => "璐у弶涓嶅眳涓�",
+ 17 => "宸︿晶瓒呴珮",
+ 18 => "鍙充晶瓒呴珮",
+ 19 => "宸︿晶瓒呭",
+ 20 => "鍙充晶瓒呭",
+ 21 => "宸﹁秴鍑�",
+ 22 => "鍙宠秴鍑�",
+ 23 => "鍙栬揣鏃惰浇璐у彴鏈夎揣",
+ 24 => "鍙栬揣鍚庤浇璐у彴鏃犺揣",
+ 25 => "鍙栨繁璐т綅鏃舵祬璐т綅鏈夎揣",
+ 26 => "鏀捐揣鏃惰浇璐у彴鏃犺揣",
+ 27 => "鏀捐揣鏃惰揣鏋舵湁璐�",
+ 28 => "鏀捐揣鍚庤浇璐у彴鏈夎揣",
+ 29 => "鏀炬繁璐ф椂娴呰揣浣嶆湁璐�",
+ 30 => "",
+ 31 => "",
+ };
object obj = new
{
Automatic = StackerCraneAutoStatus(commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Automatic)),
@@ -131,6 +166,8 @@
CurrentLayer = Convert.ToInt32(commonStackerCrane.GetValue<StackerCraneDBName, byte>(StackerCraneDBName.CurrentLayer)),
LevelPoint = commonStackerCrane.GetValue<StackerCraneDBName, int>(StackerCraneDBName.LevelPoint),
CurrentTaskNum = commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.CurrentTaskNum),
+ StackerAlarm = StackerCraneAlarm(commonStackerCrane.GetValue<StackerCraneDBName, uint>(StackerCraneDBName.StackerAlarm)),
+
commonStackerCrane.DeviceCode,
commonStackerCrane.DeviceName,
};
@@ -357,7 +394,7 @@
string[] sourceCodes = stationManager.stationLocation.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]);
}
@@ -371,7 +408,7 @@
string[] targetCodes = task.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]);
}
@@ -397,7 +434,7 @@
string[] sourceCodes = task.CurrentAddress.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]);
}
@@ -410,7 +447,7 @@
string[] targetCodes = stationManager.stationLocation.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]);
}
@@ -433,7 +470,7 @@
string[] sourceCodes = task.SourceAddress.Split("-");
if (sourceCodes.Length == 3)
{
- stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(Convert.ToInt16(sourceCodes[0]) % 2 != 0 ? (short)1 : (short)2);
+ stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
}
@@ -446,7 +483,7 @@
string[] targetCodes = task.TargetAddress.Split("-");
if (targetCodes.Length == 3)
{
- stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(Convert.ToInt16(targetCodes[0]) % 2 != 0 ? (short)1 : (short)2);
+ stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
}
@@ -459,5 +496,29 @@
}
return stackerCraneTaskCommand;
}
+
+ 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鑼冨洿鍐�");
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3