From 182a80ed28bc67dc2af6709a305430b99a7a87ac Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 29 九月 2025 10:10:30 +0800
Subject: [PATCH] 大屏
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 196 ++++++++++++++++++++----------------------------
1 files changed, 83 insertions(+), 113 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 2535656..f301a7c 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"
@@ -42,10 +42,10 @@
private readonly ITaskExecuteDetailService _taskExecuteDetailService;
private readonly ITaskRepository _taskRepository;
private readonly IRouterService _routerService;
- private readonly IShuttleCarService _shuttleCarService;
+ private readonly WIDESEAWCS_IShuttleCar.IShuttleCarService _shuttleCarService;
private readonly ICacheService _cacheService;
- public CommonStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, IShuttleCarService shuttleCarService, ICacheService cacheService)
+ public CommonStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, WIDESEAWCS_IShuttleCar.IShuttleCarService shuttleCarService, ICacheService cacheService)
{
_taskService = taskService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -73,7 +73,7 @@
#endregion
#region 浠诲姟瀹屾垚
- if (common.CompleteStatus == 2 || common.CompleteStatus == 3 || common.CompleteStatus == 4)
+ if ((common.CompleteStatus == 2 || common.CompleteStatus == 3 || common.CompleteStatus == 4) && commonStackerCrane.CurrentTaskNum > 0)
{
var remark = "姝ｅ父瀹屾垚";
if (common.CompleteStatus == 2) remark = "鎵嬪姩瀹屾垚";
@@ -81,102 +81,24 @@
WriteDebug($"{commonStackerCrane.DeviceName}浠诲姟瀹屾垚", $"{remark},浠诲姟鍙枫�恵commonStackerCrane.CurrentTaskNum}銆�");
NormalCompleted(commonStackerCrane);
}
- //DeviceProtocolDetailDTO? deviceProtocolDetail = commonStackerCrane.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.ProtocalDetailValue == commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.CompleteStatus).ToString() && x.DeviceProParamName == nameof(StackerCraneTaskCommandR.CompleteStatus));
- //if (deviceProtocolDetail != null)
- //{
- // MethodInfo? method = GetType().GetMethod(deviceProtocolDetail.ProtocolDetailType);
- // if (method != null) method.Invoke(this, new object[] { commonStackerCrane });
- //}
#endregion
+
#region 浠诲姟閫昏緫澶勭悊
if (common.Onlinestate == (short)Onlinestate.online)
{
#region 鏌ヨ浠诲姟,閫昏緫澶勭悊
- if (common.RunStatus == (short)RunStatus.Standby)
+ if (common.RunStatus == (short)RunStatus.Standby && common.WriteStatus == (short)WriteStatus.Permit)
{
- var Task = _taskService.GetTaskState((int)TaskCarStatusEnum.ShuttleCar_Finish, (int)TaskOtherTypeEnum.RelocationCar);//鑾峰彇绉昏溅浠诲姟
- var Task1 = _taskService.GetTaskState((int)CarChargingTaskEnum.CarCharging_Finish, (int)TaskOtherTypeEnum.RelocationCarCharging);//鑾峰彇绉昏溅鍏呯數浠诲姟
- if (Task != null)
- {
- SendTask(commonStackerCrane, Task);
- }
- else if (Task1 != null)
- {
- SendTask(commonStackerCrane, Task1);
- }
+ #region 绌挎杞︾Щ杞�/鍏呯數浠诲姟
+ var Task = _taskService.GetTaskState((int)CarChargingTaskEnum.CarCharging_Finish, (int)TaskOtherTypeEnum.RelocationCarCharging) ??
+ _taskService.GetTaskState((int)TaskCarStatusEnum.ShuttleCar_Finish, (int)TaskOtherTypeEnum.RelocationCar);
+ if (Task != null) SendTask(commonStackerCrane, Task);
+ #endregion
else
{
- Dt_Task? task = GetTask(commonStackerCrane);//鑾峰彇鍫嗗灈鏈轰换鍔�
- if (task != null)
- {
- if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation)//绉诲簱浠诲姟鍒ゆ柇缁堢偣鏄惁鏈夌┛姊溅
- {
- if (task.SourceIsPickPlace && task.TaskState == (int)TaskRelocationStatusEnum.RelocationNew)
- {
- var ShuttleCar = GetShuttleCarInfo(task.TargetAddress);//绉诲簱浠诲姟鍒ゆ柇缁堢偣鏄惁鏈夌┛姊溅
- if (ShuttleCar == null)
- {
- _taskService.AddRelocationCarTask("", task.TargetAddress);
- }
- else
- SendTask(commonStackerCrane, task);//涓嬪彂鍫嗗灈鏈轰换鍔�
- }
- else if (!task.SourceIsPickPlace && task.TaskState == (int)TaskRelocationStatusEnum.RelocationNew && task.ShuttleCarCode == null)
- {
- var ShuttleCar = GetShuttleCarInfo(task.SourceAddress);//绉诲簱浠诲姟鍒ゆ柇璧风偣鏄惁鏈夌┛姊溅
- if (ShuttleCar != null)
- {
- task.ShuttleCarCode = ShuttleCar.ShuttleCarCode;
- _taskService.UpdateData(task);
- }
- else _taskService.AddRelocationCarTask("", task.SourceAddress);
- }
- else if (/*!task.TargetIsPickPlace &&*/ task.TaskState == (int)TaskRelocationStatusEnum.CarSource_Finish)
- {
- var ShuttleCar = GetShuttleCarInfo(task.TargetAddress);//绉诲簱浠诲姟鍒ゆ柇缁堢偣鏄惁鏈夌┛姊溅
- if (task.TargetIsPickPlace && ShuttleCar != null)//绉昏蛋
- {
- _taskService.AddRelocationCarTask(task.TargetAddress, "", ShuttleCar.ShuttleCarCode);
- }
- else if (!task.TargetIsPickPlace && ShuttleCar == null)
- {
- _taskService.AddRelocationCarTask("", task.TargetAddress);
- #region 鏌ヨ
- task = _taskService.QueryCarOutFinish();
- if (task != null) SendTask(commonStackerCrane, task);//涓嬪彂鍫嗗灈鏈轰换鍔�
- #endregion
- }
- else
- {
- task.ShuttleCarCode = ShuttleCar?.ShuttleCarCode;
- _taskService.UpdateData(task);
- SendTask(commonStackerCrane, task);//涓嬪彂鍫嗗灈鏈轰换鍔�
- }
- }
- }
- else if (_taskService.TaskInboundTypes.Contains(task.TaskType))
- {
- var ShuttleCar = GetShuttleCarInfo(task.TargetAddress);//鍏ュ簱浠诲姟鍒ゆ柇缁堢偣鏄惁鏈夌┛姊溅
- if (task.TargetIsPickPlace && ShuttleCar != null)//绉昏蛋
- {
- _taskService.AddRelocationCarTask(task.TargetAddress, "", ShuttleCar.ShuttleCarCode);
- }
- else if (!task.TargetIsPickPlace && ShuttleCar == null)
- {
- _taskService.AddRelocationCarTask("", task.TargetAddress);
- }
- else
- {
- task.ShuttleCarCode = ShuttleCar?.ShuttleCarCode;
- _taskService.UpdateData(task);
- SendTask(commonStackerCrane, task);//涓嬪彂鍫嗗灈鏈轰换鍔�
- }
- }
- else
- SendTask(commonStackerCrane, task);//涓嬪彂鍫嗗灈鏈轰换鍔�
- }
+ Task = GetStackerCraneTask();
+ if (Task != null) SendTask(commonStackerCrane, Task);
}
-
}
#endregion
}
@@ -189,6 +111,7 @@
}
return Task.CompletedTask;
}
+
#region 浠诲姟涓嬪彂缁欏爢鍨涙満
private void SendTask(SpeStackerCrane commonStackerCrane, Dt_Task task)
{
@@ -202,6 +125,7 @@
{
if (commonStackerCrane.SetValue(StackerCraneDBName.CommandSend, sendFlag))
{
+ WriteDebug($"{commonStackerCrane.DeviceName}鎺ユ敹浠诲姟", $"WCS涓嬪彂浠诲姟,浠诲姟鍙枫�恵task.TaskNum}銆�");
if (_taskService.TaskInboundTypes.Contains(task.TaskType) ||
_taskService.TaskOutboundTypes.Contains(task.TaskType))
commonStackerCrane.LastTaskType = task.TaskType;
@@ -212,26 +136,9 @@
}
#endregion
+ #region 浠诲姟瀹屾垚
/// <summary>
- /// 浠诲姟瀹屾垚浜嬩欢璁㈤槄鐨勬柟娉�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void CommonStackerCrane_StackerCraneTaskCompletedEventHandler(object? sender, WIDESEAWCS_QuartzJob.StackerCrane.StackerCraneTaskCompletedEventArgs e)
- {
- CommonStackerCrane? commonStackerCrane = sender as CommonStackerCrane;
- if (commonStackerCrane != null)
- {
- if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5)
- {
- Console.Out.WriteLine("TaskCompleted" + e.TaskNum);
- _taskService.StackCraneTaskCompleted(e.TaskNum);
- commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
- }
- }
- }
- /// <summary>
- /// 浠诲姟姝ｅ父瀹屾垚
+ /// 浠诲姟瀹屾垚
/// </summary>
/// <param name="commonStackerCrane"></param>
public void NormalCompleted(SpeStackerCrane commonStackerCrane)
@@ -241,6 +148,69 @@
var content = _taskService.StackCraneTaskCompleted(commonStackerCrane.CurrentTaskNum);
commonStackerCrane.SetValue(StackerCraneDBName.ConfirmComplete, content.Status);
}
+ }
+ #endregion
+
+ private Dt_Task? GetStackerCraneTask()
+ {
+ Dt_Task? task = null;
+ task = _taskRepository.QueryFirst(x => _taskService.TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish && !string.IsNullOrEmpty(x.NextAddress), _taskService.TaskOrderBy);//鍏ュ簱浠诲姟
+ if (task != null) task = GetTaskOk(task);
+
+ if (task == null)
+ {
+ task = _taskRepository.QueryFirst(x => _taskService.TaskRelocationTypes.Contains(x.TaskType) &&
+ x.TaskState == (int)TaskRelocationStatusEnum.CarSource_Finish, _taskService.TaskOrderBy) ??//绉诲簱浠诲姟
+ _taskRepository.QueryFirst(x => _taskService.TaskOutboundTypes.Contains(x.TaskType) &&
+ x.TaskState == (int)TaskOutStatusEnum.Car_OutFinish, _taskService.TaskOrderBy);//鍑哄簱浠诲姟
+ if (task != null) task = GetTaskOk(task);
+ }
+ return task;
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇浠诲姟鏄惁婊¤冻鍫嗗灈鏈烘墽琛�
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ public Dt_Task? GetTaskOk(Dt_Task? task)
+ {
+ #region 鍏ュ簱/绉诲簱浠诲姟
+ if (_taskService.TaskInboundTypes.Contains(task.TaskType) || _taskService.TaskRelocationTypes.Contains(task.TaskType))
+ {
+ var ShuttleCar = GetShuttleCarInfo(task.TargetAddress);//鍏ュ簱浠诲姟鍒ゆ柇缁堢偣鏄惁鏈夌┛姊溅
+ if (task.TargetIsPickPlace && ShuttleCar != null)//绉昏蛋
+ {
+ _taskService.AddRelocationCarTask(task.TargetAddress, "", ShuttleCar.ShuttleCarCode);
+ task = null;
+ }
+ else if (!task.TargetIsPickPlace && ShuttleCar == null)
+ {
+ _taskService.AddRelocationCarTask("", task.TargetAddress);
+ task = null;
+ }
+ else
+ {
+ if (ShuttleCar != null)
+ {
+ if (_taskRepository.QueryFirst(x => x.TaskType != task.TaskType && x.ShuttleCarCode == ShuttleCar.ShuttleCarCode) != null)
+ task = null;
+ else
+ {
+ task.ShuttleCarCode = ShuttleCar.ShuttleCarCode;
+ _taskService.UpdateData(task);
+ }
+ }
+ }
+ }
+ #endregion
+
+ #region 鍑哄簱浠诲姟
+ else
+ task = OutTaskStationIsOccupied(task);
+ #endregion
+
+ return task;
}
/// <summary>
/// 鑾峰彇浠诲姟
@@ -263,8 +233,8 @@
#region 鍑哄叆搴撲换鍔�
else
{
- task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
- if (task != null) return task;
+ //task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
+ //if (task != null) return task;
if (commonStackerCrane.LastTaskType == null)
{
task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
@@ -273,7 +243,7 @@
{
if (commonStackerCrane.LastTaskType.GetValueOrDefault().GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
{
- task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode) ?? _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
+ task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
if (task == null)
{
task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
@@ -281,7 +251,7 @@
}
else
{
- task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode) ?? _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
+ task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode) /*?? _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode)*/;
if (task == null)
{
task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
--
Gitblit v1.9.3