From 299e5efbe6bd7a13a545b4a90793f29d273347f3 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 30 十月 2025 11:46:21 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 168 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 111 insertions(+), 57 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 02e6b6f..d9da8b5 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
{
@@ -62,12 +63,12 @@
{
if (commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.TaskCompleted))
{
- var x = commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.CurrentTaskNum);
StackerCraneTaskFinish(commonStackerCrane, commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.CurrentTaskNum));
}
- if (commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Automatic) && !commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Fault) && !commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Running))
+ if (commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Automatic) && !commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Fault) && !commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Running)&&!commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.InStock))
{
+
Dt_Task? task = GetTask(commonStackerCrane);
if (task != null)
@@ -75,6 +76,12 @@
StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
if (stackerCraneTaskCommand != null)
{
+ // 濡傛灉涓婁竴涓换鍔℃湭瀹屾垚锛屽垯鍏堝畬鎴愪笂涓�涓换鍔�
+ if (commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.TaskCompleted))
+ {
+ StackerCraneTaskFinish(commonStackerCrane, commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.CurrentTaskNum));
+ }
+
Thread.Sleep(1000);
bool sendFlag = commonStackerCrane.SendCommand(stackerCraneTaskCommand);
if (sendFlag)
@@ -122,41 +129,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,8 +139,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)),
-
+ StackerAlarm = GetAlarm(commonStackerCrane.GetValue<StackerCraneDBName, uint>(StackerCraneDBName.StackerAlarm)),
+ InStock=commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.InStock),
commonStackerCrane.DeviceCode,
commonStackerCrane.DeviceName,
};
@@ -182,6 +155,57 @@
}
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 +240,7 @@
{
if (commonStackerCrane != null)
{
+ WriteInfo("鍫嗗灈鏈轰换鍔″畬鎴�", $"{commonStackerCrane.DeviceName}瀹屾垚浠诲姟鍙穥TaskNum}");
var task = _taskRepository.QueryFirst(x => x.TaskNum == TaskNum);
if (task != null)
{
@@ -260,6 +285,11 @@
private Dt_Task? GetTask(CommonStackerCrane commonStackerCrane)
{
Dt_Task task;
+
+ if (!_taskService.QueryStackerTask(commonStackerCrane.DeviceCode))
+ {
+ return null;
+ }
task = _taskService.QueryRelocationTask(commonStackerCrane.DeviceCode);
if (task != null)
@@ -394,9 +424,9 @@
string[] sourceCodes = stationManager.stationLocation.Split("-");
if (sourceCodes.Length == 3)
{
- stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(sourceCodes[0]);
- stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
- stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
+ stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[1]);
}
else
{
@@ -408,9 +438,9 @@
string[] targetCodes = task.TargetAddress.Split("-");
if (targetCodes.Length == 3)
{
- stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(targetCodes[0]);
- stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
- stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
+ stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[1]);
}
else
{
@@ -434,9 +464,9 @@
string[] sourceCodes = task.CurrentAddress.Split("-");
if (sourceCodes.Length == 3)
{
- stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(sourceCodes[0]);
- stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
- stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
+ stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[1]);
}
else
{
@@ -447,9 +477,9 @@
string[] targetCodes = stationManager.stationLocation.Split("-");
if (targetCodes.Length == 3)
{
- stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(targetCodes[0]);
- stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
- stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
+ stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[1]);
}
else
{
@@ -470,9 +500,9 @@
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.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
- stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
+ stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[1]);
}
else
{
@@ -483,9 +513,9 @@
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.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
- stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
+ stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[1]);
}
else
{
@@ -496,5 +526,29 @@
}
return stackerCraneTaskCommand;
}
+
+ public int GetRowCode(int number)
+ {
+ if (number == 1 || number == 15 || number == 11 || number == 18)
+ {
+ return 1;
+ }
+ 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 == 20)
+ {
+ return 3;
+ }
+ else if (number == 4 || number == 7 || number == 10 || number == 14 || number == 21)
+ {
+ return 4;
+ }
+ else
+ {
+ throw new ArgumentOutOfRangeException(nameof(number), "杈撳叆鐨勬暟瀛楀繀椤诲湪1-16鑼冨洿鍐�");
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3