From 7da6f394864ba0412c1ac58ba7752862de7d3f3d Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期二, 06 五月 2025 10:41:48 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Gantry/GantryJob.cs | 89 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 87 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Gantry/GantryJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Gantry/GantryJob.cs"
index 7dfb4a9..51104ea 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Gantry/GantryJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Gantry/GantryJob.cs"
@@ -62,6 +62,11 @@
if (takePositions.Length != 5)
{
WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "鍙栬揣浣嶇疆閿欒");
+ if (task.ExceptionMessage?.Contains("鍙栬揣浣嶇疆閿欒") ?? true)
+ {
+ task.ExceptionMessage = "鍙栬揣浣嶇疆閿欒";
+ _taskRepository.UpdateData(task);
+ }
return Task.CompletedTask;
}
@@ -69,6 +74,11 @@
if (putPositions.Length != 5)
{
WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "鏀捐揣浣嶇疆閿欒");
+ if (task.ExceptionMessage?.Contains("鏀捐揣浣嶇疆閿欒") ?? true)
+ {
+ task.ExceptionMessage = "鏀捐揣浣嶇疆閿欒";
+ _taskRepository.UpdateData(task);
+ }
return Task.CompletedTask;
}
@@ -76,17 +86,32 @@
if (containerItem == null)
{
WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "鏉挎潗灏哄鑾峰彇閿欒");
+ if (task.ExceptionMessage?.Contains("鏉挎潗灏哄鑾峰彇閿欒") ?? true)
+ {
+ task.ExceptionMessage = "鏉挎潗灏哄鑾峰彇閿欒";
+ _taskRepository.UpdateData(task);
+ }
return Task.CompletedTask;
}
if (!LightStatusStorage.StationStautsDic.TryGetValue(putPositions[0],out bool stationStatus))
{
WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", $"宸ヤ綅銆恵putPositions[0]}銆戞湁鏃犲灚鏉挎暟鎹敊璇�,{LightStatusStorage.StationStautsDic.Serialize()}");
+ if (task.ExceptionMessage?.Contains($"宸ヤ綅銆恵putPositions[0]}銆戞湁鏃犲灚鏉挎暟鎹敊璇�") ?? true)
+ {
+ task.ExceptionMessage = $"宸ヤ綅銆恵putPositions[0]}銆戞湁鏃犲灚鏉挎暟鎹敊璇�";
+ _taskRepository.UpdateData(task);
+ }
return Task.CompletedTask;
}
if (!stationStatus)
{
WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", $"宸ヤ綅銆恵putPositions[0]}銆戞棤鍨澘,{LightStatusStorage.StationStautsDic.Serialize()}");
+ if (task.ExceptionMessage?.Contains($"宸ヤ綅銆恵putPositions[0]}銆戞棤鍨澘") ?? true)
+ {
+ task.ExceptionMessage = $"宸ヤ綅銆恵putPositions[0]}銆戞棤鍨澘";
+ _taskRepository.UpdateData(task);
+ }
return Task.CompletedTask;
}
@@ -96,7 +121,12 @@
if (OPositions.HPositions[takePositions[0]].PositionZ == 0)
{
- WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "鍙栬揣Z鍧愭爣璇诲彇涓�0");
+ WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "璇诲彇鍙栬揣Z鍧愭爣璇诲彇涓�0");
+ if (task.ExceptionMessage?.Contains($"璇诲彇鍙栬揣Z鍧愭爣璇诲彇涓�0") ?? true)
+ {
+ task.ExceptionMessage = $"璇诲彇鍙栬揣Z鍧愭爣璇诲彇涓�0";
+ _taskRepository.UpdateData(task);
+ }
return Task.CompletedTask;
}
@@ -108,7 +138,12 @@
if (OPositions.HPositions[takePositions[0]].PositionZ == 0)
{
- WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "鏀捐揣Z鍧愭爣璇诲彇涓�0");
+ WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "璇诲彇鏀捐揣Z鍧愭爣璇诲彇涓�0");
+ if (task.ExceptionMessage?.Contains($"璇诲彇鏀捐揣Z鍧愭爣璇诲彇涓�0") ?? true)
+ {
+ task.ExceptionMessage = $"璇诲彇鏀捐揣Z鍧愭爣璇诲彇涓�0";
+ _taskRepository.UpdateData(task);
+ }
return Task.CompletedTask;
}
int putPoR = 0;
@@ -140,6 +175,11 @@
else
{
WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "R鍧愭爣閿欒");
+ if (task.ExceptionMessage?.Contains($"R鍧愭爣閿欒") ?? true)
+ {
+ task.ExceptionMessage = $"R鍧愭爣閿欒";
+ _taskRepository.UpdateData(task);
+ }
return Task.CompletedTask;
}
}
@@ -164,6 +204,11 @@
if(devicePro == null)
{
WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "璁惧鍗忚鍙傛暟閿欒锛屾湭鎵惧埌鏈�澶ф渶灏忓潗鏍囧湴鍧�");
+ if (task.ExceptionMessage?.Contains($"璁惧鍗忚鍙傛暟閿欒锛屾湭鎵惧埌鏈�澶ф渶灏忓潗鏍囧湴鍧�") ?? true)
+ {
+ task.ExceptionMessage = $"璁惧鍗忚鍙傛暟閿欒锛屾湭鎵惧埌鏈�澶ф渶灏忓潗鏍囧湴鍧�";
+ _taskRepository.UpdateData(task);
+ }
return Task.CompletedTask;
}
int[] data = otherDevice.Communicator.Read<int>(devicePro.DeviceProAddress, (ushort)(devicePros.Count));
@@ -190,48 +235,88 @@
if (takePoX < minX || takePoX > maxX)
{
WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-鍧愭爣", $"X鍙栬揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿takePoX},鏈�澶у�硷細{maxX},鏈�灏忓�硷細{minX}");
+ if (task.ExceptionMessage?.Contains($"X鍙栬揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿takePoX},鏈�澶у�硷細{maxX},鏈�灏忓�硷細{minX}") ?? true)
+ {
+ task.ExceptionMessage = $"X鍙栬揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿takePoX},鏈�澶у�硷細{maxX},鏈�灏忓�硷細{minX}";
+ _taskRepository.UpdateData(task);
+ }
return Task.CompletedTask;
}
if (putPoX < minX || putPoX > maxX)
{
WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-鍧愭爣", $"X鏀捐揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿putPoX},鏈�澶у�硷細{maxX},鏈�灏忓�硷細{minX}");
+ if (task.ExceptionMessage?.Contains($"X鏀捐揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿putPoX},鏈�澶у�硷細{maxX},鏈�灏忓�硷細{minX}") ?? true)
+ {
+ task.ExceptionMessage = $"X鏀捐揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿putPoX},鏈�澶у�硷細{maxX},鏈�灏忓�硷細{minX}";
+ _taskRepository.UpdateData(task);
+ }
return Task.CompletedTask;
}
if (takePoY < minY || takePoY > maxY)
{
WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-鍧愭爣", $"Y鍙栬揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿takePoY},鏈�澶у�硷細{maxY},鏈�灏忓�硷細{minY}");
+ if (task.ExceptionMessage?.Contains($"Y鍙栬揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿takePoY},鏈�澶у�硷細{maxY},鏈�灏忓�硷細{minY}") ?? true)
+ {
+ task.ExceptionMessage = $"Y鍙栬揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿takePoY},鏈�澶у�硷細{maxY},鏈�灏忓�硷細{minY}";
+ _taskRepository.UpdateData(task);
+ }
return Task.CompletedTask;
}
if (putPoY < minY || putPoY > maxY)
{
WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-鍧愭爣", $"Y鏀捐揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿putPoY},鏈�澶у�硷細{maxY},鏈�灏忓�硷細{minY}");
+ if (task.ExceptionMessage?.Contains($"Y鏀捐揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿putPoY},鏈�澶у�硷細{maxY},鏈�灏忓�硷細{minY}") ?? true)
+ {
+ task.ExceptionMessage = $"Y鏀捐揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿putPoY},鏈�澶у�硷細{maxY},鏈�灏忓�硷細{minY}";
+ _taskRepository.UpdateData(task);
+ }
return Task.CompletedTask;
}
if (takePoZ < minZ || takePoZ > maxZ)
{
WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-鍧愭爣", $"Z鍙栬揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿takePoZ},鏈�澶у�硷細{maxZ},鏈�灏忓�硷細{minZ}");
+ if (task.ExceptionMessage?.Contains($"Z鍙栬揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿takePoZ},鏈�澶у�硷細{maxZ},鏈�灏忓�硷細{minZ}") ?? true)
+ {
+ task.ExceptionMessage = $"Z鍙栬揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿takePoZ},鏈�澶у�硷細{maxZ},鏈�灏忓�硷細{minZ}";
+ _taskRepository.UpdateData(task);
+ }
return Task.CompletedTask;
}
if (putPoZ < minZ || putPoZ > maxZ)
{
WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-鍧愭爣", $"Z鏀捐揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿putPoZ},鏈�澶у�硷細{maxZ},鏈�灏忓�硷細{minZ}");
+ if (task.ExceptionMessage?.Contains($"Z鏀捐揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿putPoZ},鏈�澶у�硷細{maxZ},鏈�灏忓�硷細{minZ}") ?? true)
+ {
+ task.ExceptionMessage = $"Z鏀捐揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿putPoZ},鏈�澶у�硷細{maxZ},鏈�灏忓�硷細{minZ}";
+ _taskRepository.UpdateData(task);
+ }
return Task.CompletedTask;
}
if (takePoR < minR || takePoR > maxR)
{
WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-鍧愭爣", $"R鍙栬揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿takePoR},鏈�澶у�硷細{maxR},鏈�灏忓�硷細{minR}");
+ if (task.ExceptionMessage?.Contains($"R鍙栬揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿takePoR},鏈�澶у�硷細{maxR},鏈�灏忓�硷細{minR}") ?? true)
+ {
+ task.ExceptionMessage = $"R鍙栬揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿takePoR},鏈�澶у�硷細{maxR},鏈�灏忓�硷細{minR}";
+ _taskRepository.UpdateData(task);
+ }
return Task.CompletedTask;
}
if (putPoR < minR || putPoR > maxR)
{
WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-鍧愭爣", $"R鏀捐揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿putPoR},鏈�澶у�硷細{maxR},鏈�灏忓�硷細{minR}");
+ if (task.ExceptionMessage?.Contains($"R鏀捐揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿putPoR},鏈�澶у�硷細{maxR},鏈�灏忓�硷細{minR}") ?? true)
+ {
+ task.ExceptionMessage = $"R鏀捐揣鍧愭爣瓒呭嚭鑼冨洿,鍙栬揣鍧愭爣锛歿putPoR},鏈�澶у�硷細{maxR},鏈�灏忓�硷細{minR}";
+ _taskRepository.UpdateData(task);
+ }
return Task.CompletedTask;
}
#endregion
--
Gitblit v1.9.3