From bec4a1b386c740ce4fc53a52b8ec8846ffb5f2bd Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期日, 17 八月 2025 15:53:25 +0800
Subject: [PATCH] 代码优化
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 122 +++++++++++++++++++++++-----------------
1 files changed, 70 insertions(+), 52 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 4045cd2..55f5a0c 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"
@@ -28,6 +28,7 @@
using WIDESEAWCS_Tasks.ConveyorLineJob;
using WIDESEAWCS_TaskInfoRepository;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
+using System.Collections;
namespace WIDESEAWCS_Tasks
{
@@ -122,41 +123,7 @@
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)),
@@ -166,7 +133,7 @@
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)),
+ StackerAlarm = GetAlarm(commonStackerCrane.GetValue<StackerCraneDBName, uint>(StackerCraneDBName.StackerAlarm)),
commonStackerCrane.DeviceCode,
commonStackerCrane.DeviceName,
@@ -182,6 +149,56 @@
}
return Task.CompletedTask;
}
+ public string GetAlarm(uint value)
+ {
+ byte[] bytes = BitConverter.GetBytes(value);
+ BitArray bits = new BitArray(bytes);
+
+ for (int i = 0; i < bits.Length; i++)
+ {
+ if (bits[i])
+ {
+ return StackerCraneAlarm(i);
+ }
+ }
+ return "";
+ }
+ public string StackerCraneAlarm(int 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 => "",
+ _ => $"鏈煡鎶ヨ({alarm})"
+ };
/// <summary>
/// 浠诲姟瀹屾垚浜嬩欢璁㈤槄鐨勬柟娉�
@@ -216,6 +233,7 @@
{
if (commonStackerCrane != null)
{
+ WriteInfo("鍫嗗灈鏈轰换鍔″畬鎴�", $"{commonStackerCrane.DeviceName}瀹屾垚浠诲姟鍙穥TaskNum}");
var task = _taskRepository.QueryFirst(x => x.TaskNum == TaskNum);
if (task != null)
{
@@ -395,8 +413,8 @@
if (sourceCodes.Length == 3)
{
stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
- stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
- stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[1]);
}
else
{
@@ -409,8 +427,8 @@
if (targetCodes.Length == 3)
{
stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
- stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
- stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[1]);
}
else
{
@@ -435,8 +453,8 @@
if (sourceCodes.Length == 3)
{
stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
- stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
- stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[1]);
}
else
{
@@ -448,8 +466,8 @@
if (targetCodes.Length == 3)
{
stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
- stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
- stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[1]);
}
else
{
@@ -471,8 +489,8 @@
if (sourceCodes.Length == 3)
{
stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
- stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
- stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[1]);
}
else
{
@@ -484,8 +502,8 @@
if (targetCodes.Length == 3)
{
stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
- stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
- stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[1]);
}
else
{
@@ -499,19 +517,19 @@
public int GetRowCode(int number)
{
- if (number == 1 || number == 15 || number == 11 || number == 19)
+ if (number == 1 || number == 15 || number == 11 || number == 18)
{
return 1;
}
- else if (number == 2 || number == 5 || number == 8 || number == 12 || number == 16 || number == 20)
+ else if (number == 2 || number == 5 || number == 8 || number == 12 || number == 16 || number == 19)
{
return 2;
}
- else if (number == 3 || number == 6 || number == 9 || number == 13 || number == 17 || number == 21)
+ else if (number == 3 || number == 6 || number == 9 || number == 13 || number == 17 || number == 20)
{
return 3;
}
- else if (number == 4 || number == 7 || number == 10 || number == 14 || number == 18 || number == 22)
+ else if (number == 4 || number == 7 || number == 10 || number == 14 || number == 21)
{
return 4;
}
--
Gitblit v1.9.3