增加质检出入库逻辑

dengjunjie

10 天以前 7ca9651f81d7b84f054194d3d46fdbd1d9c8b922

 ÏîÄ¿´úÂë/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)
@@ -58,60 +62,43 @@
                SpeStackerCrane commonStackerCrane = (SpeStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
                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 ä»»åŠ¡é€»è¾‘处理
                    if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.Onlinestate) == (short)Onlinestate.online
                    && commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WriteStatus) == (short)WriteStatus.Permit)
                    #region ä»»åŠ¡å®Œæˆ
                    if (common.CompleteStatus == 2 || common.CompleteStatus == 3 || common.CompleteStatus == 4)
                    {
                        #region ä»»åŠ¡å®Œæˆ
                        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
                        var remark = "正常完成";
                        if (common.CompleteStatus == 2) remark = "手动完成";
                        if (common.CompleteStatus == 4) remark = "错误完成";
                        WriteDebug($"{commonStackerCrane.DeviceName}任务完成", $"{remark},任务号【{commonStackerCrane.CurrentTaskNum}】");
                        NormalCompleted(commonStackerCrane);
                    }
                    #endregion

                    #region ä»»åŠ¡é€»è¾‘处理
                    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);//获取移车任务
                            if (Task != null)
                            {
                                if (Task.TaskState == (int)TaskCarStatusEnum.ShuttleCar_Finish) SendTask(commonStackerCrane, Task);
                            }
                            #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)TaskInboundTypeEnum.Inbound)
                                    {
                                        var ShuttleCar = GetShuttleCarInfo(task.TargetAddress);//入库任务判断是否存在穿梭车
                                        if (task.IsPickPlace && ShuttleCar != null)//移走
                                        {
                                            _taskService.AddRelocationCarTask(task.TargetAddress, "", ShuttleCar.ShuttleCarCode);
                                        }
                                        else if (!task.IsPickPlace && 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
                    }
@@ -120,10 +107,11 @@
            }
            catch (Exception ex)
            {
                Console.WriteLine(nameof(CommonStackerCraneJob) + ":" + ex.ToString());
                //Console.WriteLine(nameof(CommonStackerCraneJob) + ":" + ex.ToString());
            }
            return Task.CompletedTask;
        }

        #region ä»»åŠ¡ä¸‹å‘给堆垛机
        private void SendTask(SpeStackerCrane commonStackerCrane, Dt_Task task)
        {
@@ -132,12 +120,14 @@
            if (stackerCraneTaskCommand != null)
            {
                bool sendFlag = commonStackerCrane.SendCommand(stackerCraneTaskCommand);
                bool worktype = commonStackerCrane.SetValue(StackerCraneDBName.WorkType, task.TaskType == (int)TaskOtherTypeEnum.RelocationCar ? (short)WorkType.Car : (short)WorkType.Cargo);
                bool worktype = commonStackerCrane.SetValue(StackerCraneDBName.WorkType, task.TaskType >= (int)TaskOtherTypeEnum.RelocationCar ? (short)WorkType.Car : (short)WorkType.Cargo);
                if (sendFlag && worktype)
                {
                    if (commonStackerCrane.SetValue(StackerCraneDBName.CommandSend, sendFlag))
                    {
                        if (task.TaskType != (int)TaskOtherTypeEnum.RelocationCar) commonStackerCrane.LastTaskType = task.TaskType;
                        if (_taskService.TaskInboundTypes.Contains(task.TaskType) ||
                            _taskService.TaskOutboundTypes.Contains(task.TaskType))
                            commonStackerCrane.LastTaskType = task.TaskType;
                        _taskService.UpdateTaskStatusToNext(task.TaskNum);
                    }
                }
@@ -145,39 +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)
            {
                //if (_taskService.GetTaskInfo(commonStackerCrane.CurrentTaskNum) != null)
                //{
                Console.Out.WriteLine($"堆垛机任务完成：[{commonStackerCrane.CurrentTaskNum}]；{DateTime.Now}");
                var Status = _taskService.StackCraneTaskCompleted(commonStackerCrane.CurrentTaskNum).Status;
                commonStackerCrane.SetValue(StackerCraneDBName.ConfirmComplete, Status);
                //}
                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>
        /// èŽ·å–任务
@@ -186,52 +218,69 @@
        /// <returns></returns>
        private Dt_Task? GetTask(SpeStackerCrane commonStackerCrane)
        {
            Dt_Task task;
            if (commonStackerCrane.LastTaskType == null)
            Dt_Task task = _taskService.QueryStackerCraneRelocationTask(commonStackerCrane.DeviceCode);//获取移库任务
            #region å­˜åœ¨ç§»åº“任务必须先执行移库任务
            if (task != null)
            {
                task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
                return task;
                //if (task.SourceIsPickPlace && task.ShuttleCarCode != null)
                //    return task;
                //else return null;
            }
            #endregion

            #region å‡ºå…¥åº“任务
            else
            {
                if (commonStackerCrane.LastTaskType.GetValueOrDefault().GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                //task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
                //if (task != null) return task;
                if (commonStackerCrane.LastTaskType == null)
                {
                    task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
                    if (task == null)
                    {
                        task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
                    }
                    task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
                }
                else
                {
                    task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
                    if (task == null)
                    if (commonStackerCrane.LastTaskType.GetValueOrDefault().GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                    {
                        task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
                        if (task == null)
                        {
                            task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
                        }
                    }
                    else
                    {
                        task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode) /*?? _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode)*/;
                        if (task == null)
                        {
                            task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
                        }
                    }
                }

                if (task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                {
                    if (OutTaskStationIsOccupied(task) != null)
                    {
                        return task;
                    }
                    else
                    {
                        List<string> otherOutStaionCodes = _routerService.QueryNextRoutes(commonStackerCrane.DeviceCode, task.NextAddress).Select(x => x.ChildPosi).ToList();
                        List<Dt_Task> tasks = _taskService.QueryStackerCraneOutTasks(commonStackerCrane.DeviceCode, otherOutStaionCodes);
                        foreach (var item in tasks)
                        {
                            if (OutTaskStationIsOccupied(item) != null)
                            {
                                return item;
                            }
                        }
                        task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
                    }
                }
                if (task != null && !string.IsNullOrEmpty(task.TargetAddress)) return task;//入库任务判断是否已分配货位，WMS判断货位状态是否允许放货
            }

            if (task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
            {
                if (OutTaskStationIsOccupied(task) != null)
                {
                    return task;
                }
                else
                {
                    List<string> otherOutStaionCodes = _routerService.QueryNextRoutes(commonStackerCrane.DeviceCode, task.NextAddress).Select(x => x.ChildPosi).ToList();
                    List<Dt_Task> tasks = _taskService.QueryStackerCraneOutTasks(commonStackerCrane.DeviceCode, otherOutStaionCodes);
                    foreach (var item in tasks)
                    {
                        if (OutTaskStationIsOccupied(item) != null)
                        {
                            return item;
                        }
                    }
                    task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
                }
            }
            if (task != null && !string.IsNullOrEmpty(task.TargetAddress)) return task;//入库任务判断是否已分配货位，WMS判断货位状态是否允许放货
            #endregion
            return task;
        }

@@ -249,10 +298,15 @@
                if (device != null)
                {
                    CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
                    if (conveyorLine.IsOccupied(router.ChildPosi))//出库站台未被占用
                    ConveyorLineTaskCommandR command = conveyorLine.ReadCustomer<ConveyorLineTaskCommandR>(router.ChildPosi);
                    if (command.Status == 4)
                    {
                        return task;
                    }
                    //if (conveyorLine.IsOccupied(router.ChildPosi))//出库站台未被占用
                    //{
                    //    return task;
                    //}
                }
                else
                {
@@ -289,7 +343,8 @@
                    string[] targetCodes = task.NextAddress.Split("-");
                    if (targetCodes.Length == 3)
                    {
                        stackerCraneTaskCommand.EndRow = Convert.ToInt16(targetCodes[0]);
                        var EndRow = Convert.ToInt16(targetCodes[0]);
                        stackerCraneTaskCommand.EndRow = EndRow;// Convert.ToInt16(EndRow > 1 ? EndRow - 1 : EndRow);
                        stackerCraneTaskCommand.EndColumn = Convert.ToInt16(targetCodes[1]);
                        stackerCraneTaskCommand.EndLayer = Convert.ToInt16(targetCodes[2]);
                    }
@@ -318,7 +373,8 @@
                    string[] sourceCodes = task.CurrentAddress.Split("-");
                    if (sourceCodes.Length == 3)
                    {
                        stackerCraneTaskCommand.StartRow = Convert.ToInt16(sourceCodes[0]);
                        var StartRow = Convert.ToInt16(sourceCodes[0]);
                        stackerCraneTaskCommand.StartRow = StartRow;// Convert.ToInt16(StartRow > 1 ? StartRow - 1 : StartRow);
                        stackerCraneTaskCommand.StartColumn = Convert.ToInt16(sourceCodes[1]);
                        stackerCraneTaskCommand.StartLayer = Convert.ToInt16(sourceCodes[2]);
                    }
@@ -340,7 +396,8 @@
                string[] targetCodes = task.NextAddress.Split("-");
                if (targetCodes.Length == 3)
                {
                    stackerCraneTaskCommand.EndRow = Convert.ToInt16(targetCodes[0]);
                    var EndRow = Convert.ToInt16(targetCodes[0]);
                    stackerCraneTaskCommand.EndRow = EndRow;// Convert.ToInt16(EndRow > 1 ? EndRow - 1 : EndRow);
                    stackerCraneTaskCommand.EndColumn = Convert.ToInt16(targetCodes[1]);
                    stackerCraneTaskCommand.EndLayer = Convert.ToInt16(targetCodes[2]);
                }
@@ -353,7 +410,8 @@
                string[] sourceCodes = task.CurrentAddress.Split("-");
                if (sourceCodes.Length == 3)
                {
                    stackerCraneTaskCommand.StartRow = Convert.ToInt16(sourceCodes[0]);
                    var SourceRow = Convert.ToInt16(sourceCodes[0]);
                    stackerCraneTaskCommand.StartRow = SourceRow;// Convert.ToInt16(SourceRow > 1 ? SourceRow - 1 : SourceRow);
                    stackerCraneTaskCommand.StartColumn = Convert.ToInt16(sourceCodes[1]);
                    stackerCraneTaskCommand.StartLayer = Convert.ToInt16(sourceCodes[2]);
                }