优化空托出入库逻辑

dengjunjie

2025-04-19 9e579eda4601ed7b492b9d19a24e8146f6ebdf8d

 ÏîÄ¿´úÂë/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,32 +63,38 @@
                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 ä»»åŠ¡å®Œæˆ
                    DeviceProtocolDetailDTO? deviceProtocolDetail = commonStackerCrane.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.ProtocalDetailValue == commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.CompleteStatus).ToString() && x.DeviceProParamName == nameof(StackerCraneTaskCommandR.CompleteStatus));
                    if (deviceProtocolDetail != null)
                    if (common.CompleteStatus == 2 || common.CompleteStatus == 3)
                    {
                        MethodInfo? method = GetType().GetMethod(deviceProtocolDetail.ProtocolDetailType);
                        if (method != null) method.Invoke(this, new object[] { commonStackerCrane });
                        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(TaskType: (int)TaskOtherTypeEnum.RelocationCar);//获取移车任务
                            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)
                            {
                                if (Task.TaskState == (int)TaskCarStatusEnum.ShuttleCar_Finish) SendTask(commonStackerCrane, Task);
                                SendTask(commonStackerCrane, Task);
                            }
                            else if (Task1 != null)
                            {
@@ -97,23 +107,38 @@
                                {
                                    if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation)//移库任务判断终点是否有穿梭车
                                    {
                                        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);
                                        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 (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
                                    else if (_taskService.TaskInboundTypes.Contains(task.TaskType))
                                    {
                                        var ShuttleCar = GetShuttleCarInfo(task.TargetAddress);//入库任务判断终点是否有穿梭车
                                        if (task.TargetIsPickPlace && ShuttleCar != null)//移走
@@ -208,39 +233,7 @@
        {
            Dt_Task task = _taskService.QueryStackerCraneRelocationTask(commonStackerCrane.DeviceCode);//获取移库任务
            #region å­˜åœ¨ç§»åº“任务必须先执行移库任务
            if (task != null)
            {
                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);//下发堆垛机任务
                    }
                }
            }
            if (task != null) return task;
            #endregion

            #region å‡ºå…¥åº“任务