From 7ca9651f81d7b84f054194d3d46fdbd1d9c8b922 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 09 七月 2025 22:55:27 +0800
Subject: [PATCH] 增加质检出入库逻辑
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 220 +++++++++++++++++++++++++++---------------------------
1 files changed, 110 insertions(+), 110 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 7a9f88c..1066bcb 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"
@@ -16,6 +16,7 @@
using WIDESEAWCS_Common.StackerCraneEnum;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.Caches;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_IShuttleCar;
using WIDESEAWCS_ITaskInfoRepository;
@@ -29,6 +30,7 @@
using WIDESEAWCS_QuartzJob.StackerCrane.Enum;
using WIDESEAWCS_TaskInfoService;
using WIDESEAWCS_Tasks.ConveyorLineJob;
+using WIDESEAWCS_Tasks.ShuttleCarJob;
using WIDESEAWCS_Tasks.StackerCraneJob;
namespace WIDESEAWCS_Tasks
@@ -41,14 +43,16 @@
private readonly ITaskRepository _taskRepository;
private readonly IRouterService _routerService;
private readonly IShuttleCarService _shuttleCarService;
+ private readonly ICacheService _cacheService;
- public CommonStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, IShuttleCarService shuttleCarService)
+ public CommonStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, IShuttleCarService shuttleCarService, ICacheService cacheService)
{
_taskService = taskService;
_taskExecuteDetailService = taskExecuteDetailService;
_taskRepository = taskRepository;
_routerService = routerService;
_shuttleCarService = shuttleCarService;
+ _cacheService = cacheService;
}
public Task Execute(IJobExecutionContext context)
@@ -59,103 +63,42 @@
if (commonStackerCrane != null)
{
commonStackerCrane.Communicator.IsReadAfterWrite = false;
+ #region 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ StackerCraneTaskCommandR common = ReadCustomer<StackerCraneTaskCommandR>(commonStackerCrane, commonStackerCrane.DeviceCode);
+ _cacheService.AddOrUpdate(commonStackerCrane.DeviceCode, common);
+ #endregion
#region 淇″彿浜や簰澶勭悊
//Heartbeat(commonStackerCrane);
ShuttleCarSignal(commonStackerCrane);
#endregion
#region 浠诲姟瀹屾垚
- var completeStatus = commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.CompleteStatus);
- if (completeStatus == 2 || completeStatus == 3)
+ if (common.CompleteStatus == 2 || common.CompleteStatus == 3 || common.CompleteStatus == 4)
{
+ var remark = "姝ｅ父瀹屾垚";
+ if (common.CompleteStatus == 2) remark = "鎵嬪姩瀹屾垚";
+ if (common.CompleteStatus == 4) remark = "閿欒瀹屾垚";
+ 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 浠诲姟閫昏緫澶勭悊
- var onlinestate = commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.Onlinestate);
- var writeStatus = commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WriteStatus);
- if (onlinestate == (short)Onlinestate.online /*&& writeStatus == (short)WriteStatus.Permit*/)
+ if (common.Onlinestate == (short)Onlinestate.online)
{
#region 鏌ヨ浠诲姟,閫昏緫澶勭悊
- if (Enum.Parse<RunStatus>(commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.RunStatus).ToString()) == RunStatus.Standby)
+ if (common.RunStatus == (short)RunStatus.Standby)
{
- var Task = _taskService.GetTaskState((int)TaskCarStatusEnum.ShuttleCar_Finish, (int)TaskOtherTypeEnum.RelocationCar);//鑾峰彇绉昏溅浠诲姟
- var Task1 = _taskService.GetTaskState((int)CarChargingTaskEnum.ShuttleCar_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)
- SendTask(commonStackerCrane, task);//涓嬪彂鍫嗗灈鏈轰换鍔�
- else if (!task.SourceIsPickPlace && task.TaskState == (int)TaskRelocationStatusEnum.RelocationNew)
- {
- 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);
- }
- 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
}
@@ -168,6 +111,7 @@
}
return Task.CompletedTask;
}
+
#region 浠诲姟涓嬪彂缁欏爢鍨涙満
private void SendTask(SpeStackerCrane commonStackerCrane, Dt_Task task)
{
@@ -181,7 +125,9 @@
{
if (commonStackerCrane.SetValue(StackerCraneDBName.CommandSend, sendFlag))
{
- commonStackerCrane.LastTaskType = task.TaskType;
+ if (_taskService.TaskInboundTypes.Contains(task.TaskType) ||
+ _taskService.TaskOutboundTypes.Contains(task.TaskType))
+ commonStackerCrane.LastTaskType = task.TaskType;
_taskService.UpdateTaskStatusToNext(task.TaskNum);
}
}
@@ -189,35 +135,81 @@
}
#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)
{
if (commonStackerCrane != null)
{
- _taskService.StackCraneTaskCompleted(commonStackerCrane.CurrentTaskNum);
- commonStackerCrane.SetValue(StackerCraneDBName.ConfirmComplete, true);
+ 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>
/// 鑾峰彇浠诲姟
@@ -228,12 +220,20 @@
{
Dt_Task task = _taskService.QueryStackerCraneRelocationTask(commonStackerCrane.DeviceCode);//鑾峰彇绉诲簱浠诲姟
#region 瀛樺湪绉诲簱浠诲姟蹇呴』鍏堟墽琛岀Щ搴撲换鍔�
- if (task != null) return task;
+ if (task != null)
+ {
+ return task;
+ //if (task.SourceIsPickPlace && task.ShuttleCarCode != null)
+ // return task;
+ //else return null;
+ }
#endregion
#region 鍑哄叆搴撲换鍔�
else
{
+ //task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
+ //if (task != null) return task;
if (commonStackerCrane.LastTaskType == null)
{
task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
@@ -242,7 +242,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);
@@ -250,7 +250,7 @@
}
else
{
- task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
+ task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode) /*?? _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode)*/;
if (task == null)
{
task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
@@ -344,7 +344,7 @@
if (targetCodes.Length == 3)
{
var EndRow = Convert.ToInt16(targetCodes[0]);
- stackerCraneTaskCommand.EndRow = Convert.ToInt16(EndRow > 1 ? EndRow - 1 : EndRow);
+ stackerCraneTaskCommand.EndRow = EndRow;// Convert.ToInt16(EndRow > 1 ? EndRow - 1 : EndRow);
stackerCraneTaskCommand.EndColumn = Convert.ToInt16(targetCodes[1]);
stackerCraneTaskCommand.EndLayer = Convert.ToInt16(targetCodes[2]);
}
@@ -374,7 +374,7 @@
if (sourceCodes.Length == 3)
{
var StartRow = Convert.ToInt16(sourceCodes[0]);
- stackerCraneTaskCommand.StartRow = Convert.ToInt16(StartRow > 1 ? StartRow - 1 : StartRow);
+ stackerCraneTaskCommand.StartRow = StartRow;// Convert.ToInt16(StartRow > 1 ? StartRow - 1 : StartRow);
stackerCraneTaskCommand.StartColumn = Convert.ToInt16(sourceCodes[1]);
stackerCraneTaskCommand.StartLayer = Convert.ToInt16(sourceCodes[2]);
}
@@ -397,7 +397,7 @@
if (targetCodes.Length == 3)
{
var EndRow = Convert.ToInt16(targetCodes[0]);
- stackerCraneTaskCommand.EndRow = Convert.ToInt16(EndRow > 1 ? EndRow - 1 : EndRow);
+ stackerCraneTaskCommand.EndRow = EndRow;// Convert.ToInt16(EndRow > 1 ? EndRow - 1 : EndRow);
stackerCraneTaskCommand.EndColumn = Convert.ToInt16(targetCodes[1]);
stackerCraneTaskCommand.EndLayer = Convert.ToInt16(targetCodes[2]);
}
@@ -411,7 +411,7 @@
if (sourceCodes.Length == 3)
{
var SourceRow = Convert.ToInt16(sourceCodes[0]);
- stackerCraneTaskCommand.StartRow = Convert.ToInt16(SourceRow > 1 ? SourceRow - 1 : SourceRow);
+ stackerCraneTaskCommand.StartRow = SourceRow;// Convert.ToInt16(SourceRow > 1 ? SourceRow - 1 : SourceRow);
stackerCraneTaskCommand.StartColumn = Convert.ToInt16(sourceCodes[1]);
stackerCraneTaskCommand.StartLayer = Convert.ToInt16(sourceCodes[2]);
}
--
Gitblit v1.9.3