From 7803a1f8d35c9b80ae07f14c60f871a74a5aebd6 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 31 三月 2026 15:28:00 +0800
Subject: [PATCH] 更新领料判断
---
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/原料库/StackerCraneJob_YLSC3.cs | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/StackerCraneJob_YLSC3.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/StackerCraneJob_YLSC3.cs"
index ff16b81..eb621f9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/StackerCraneJob_YLSC3.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/StackerCraneJob_YLSC3.cs"
@@ -26,6 +26,7 @@
using HslCommunication.WebSocket;
using WIDESEAWCS_DTO.Equipment;
using WIDESEAWCS_QuartzJob.StackerCrane;
+using WIDESEAWCS_DTO.TaskInfo;
namespace WIDESEAWCS_Tasks
{
@@ -94,6 +95,19 @@
Thread.Sleep(1000);
}
}
+ }
+ ErrorDeviceInfo? deviceInfo = RoadwayError.Roadways.FirstOrDefault(x => x.Code == commonStackerCrane.DeviceCode);
+ if (deviceInfo != null)
+ {
+ RoadwayError.Roadways.Remove(deviceInfo);
+ }
+ }
+ else
+ {
+ ErrorDeviceInfo? deviceInfo = RoadwayError.Roadways.FirstOrDefault(x => x.Code == commonStackerCrane.DeviceCode);
+ if (deviceInfo == null)
+ {
+ RoadwayError.Roadways.Add(new ErrorDeviceInfo() { Code = commonStackerCrane.DeviceCode, Roadway = commonStackerCrane.DeviceCode });
}
}
}
@@ -266,7 +280,7 @@
Dt_Task? task;
if (commonStackerCrane.LastTaskType == null)
{
- task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
+ task = _taskService.QueryStackerYLTask(commonStackerCrane.DeviceCode);
}
else
{
@@ -276,13 +290,13 @@
task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
if (task == null)
{
- task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
+ task = _taskService.QueryStackerYLTask(commonStackerCrane.DeviceCode, TaskTypeGroup.OutbondGroup);
}
}
else
{
//涓婁竴涓负鍏ュ簱鍒欐煡鏄惁瀛樺湪鍑哄簱浠诲姟 浜ゆ浛鎵ц
- task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
+ task = _taskService.QueryStackerYLTask(commonStackerCrane.DeviceCode, TaskTypeGroup.OutbondGroup);
if (task == null)
{
task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
@@ -346,6 +360,7 @@
{
task.ExceptionMessage = "鍑哄簱绔欏彴鏃犳硶涓嬪彂";
_taskRepository.UpdateData(task);
+ WriteInfo(task.DeviceCode, $"鍑哄簱绔欏彴鏃犳硶涓嬪彂");
}
}
else
--
Gitblit v1.9.3