1

huanghongfeng

10 天以前 f49fa4b5027cfdc27b429985d023e8002abcca2e

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -49,6 +49,7 @@
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_TaskInfoRepository;
using static Microsoft.IO.RecyclableMemoryStreamManager;

namespace WIDESEAWCS_TaskInfoService
@@ -59,6 +60,7 @@
        private readonly ITaskExecuteDetailService _taskExecuteDetailService;
        private readonly ITaskExecuteDetailRepository _taskExecuteDetailRepository;
        private readonly ITask_HtyService _task_HtyService;
        private readonly ITask_HtyRepository _task_HtyRepository;
        private readonly IMapper _mapper;

        private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -73,12 +75,13 @@

        public List<int> TaskOutboundTypes => typeof(TaskOutboundTypeEnum).GetEnumIndexList();

        public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService) : base(BaseDal)
        public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService, ITask_HtyRepository task_HtyRepository) : base(BaseDal)
        {
            _routerService = routerService;
            _taskExecuteDetailService = taskExecuteDetailService;
            _taskExecuteDetailRepository = taskExecuteDetailRepository;
            _task_HtyService = task_HtyService;
            _task_HtyRepository = task_HtyRepository;
            _mapper = mapper;
        }

@@ -241,11 +244,11 @@
                        WriteLog.GetLog("PLC日志出库日志").Write($"空托出库失败，详情：{content.Message}", "需要空托");
                    }
                }
                return content = WebResponseContent.Instance.Error();
                return content;
            }
            catch (Exception ex)
            {
                return content = WebResponseContent.Instance.Error(ex.Message);
                return content.Error(ex.Message);
            }
        }

@@ -364,7 +367,7 @@
                        if (task.TaskNum != _Task.TaskNum)
                        {
                            WriteLog.GetLog("接收任务").Write("移库任务：" + JsonConvert.SerializeObject(task), "接收任务");
                            task.TaskState = (int)TaskRelocationTypeEnum.Relocation;
                            task.TaskState = (int)TaskOutStatusEnum.ResRestNet;
                            task.Roadway = task.Roadway == "1" ? task.Roadway = "SC01" : task.Roadway = "SC02";
                            task.TaskNum = task.TaskNum;
                            task.Grade = 3;
@@ -622,13 +625,10 @@
                        return content = WebResponseContent.Instance.Error($"该任务状态不可跳转到下一步,任务号:【{task.TaskNum}】,任务状态:【{task.TaskState}】");
                    }

                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
                    //int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();

                    task.TaskState = nextStatus;
                    if (task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
                    {
                        task.Dispatchertime = DateTime.Now;
                    }
                    task.TaskState = (int)TaskOutStatusEnum.SC_OutExecuting;
                    task.Dispatchertime = DateTime.Now;
                }
                else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
                {
@@ -637,34 +637,17 @@
                        return content = WebResponseContent.Instance.Error($"该任务状态不可跳转到下一步,任务号:【{task.TaskNum}】,任务状态:【{task.TaskState}】");
                    }

                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
                    task.TaskState = nextStatus;
                    if (task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
                    {
                        task.Dispatchertime = DateTime.Now;
                    }
                    if (task.TaskState == (int)TaskRelocationTypeEnum.Relocation)
                    {
                        Random random = new Random();
                        task.CurrentAddress = task.NextAddress;
                        task.NextAddress = $"{random.Next(1, 100).ToString().PadLeft(3, '0')}-{random.Next(1, 100).ToString().PadLeft(3, '0')}-{random.Next(1, 100).ToString().PadLeft(3, '0')}";
                        task.TargetAddress = task.NextAddress;
                    }
                    //int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
                    task.TaskState = (int)TaskInStatusEnum.SC_InExecuting;
                    task.Dispatchertime = DateTime.Now;
                }
                else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
                else if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation)
                {
                    if (task.TaskState <= (int)TaskRelocationStatusEnum.SC_RelocationFinish)
                    if (task.TaskState != (int)TaskOutStatusEnum.ResRestNet)
                    {
                        
                        return content = WebResponseContent.Instance.Error($"该任务状态不可跳转到下一步,任务号:【{task.TaskNum}】,任务状态:【{task.TaskState}】");
                    }

                    int nextStatus = (int)TaskRelocationStatusEnum.SC_RelocationExecuting;
                    task.TaskState = nextStatus;
                    if (task.TaskState == (int)TaskRelocationStatusEnum.SC_RelocationExecuting)
                    {
                        task.Dispatchertime = DateTime.Now;
                    }
                    task.TaskState = (int)TaskOutStatusEnum.ResRest;    //下发移库任务
                }
                else
                {
@@ -756,7 +739,7 @@

                    content = HttpHelper.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}&HowWorks=2");

                    wcs_PLCto09("出库任务",$"条码：{task.PalletCode},任务号：{task.TaskNum}",$"调取wms任务反馈：{JsonConvert.SerializeObject(content)}");
                    wcs_PLCto09("出库任务", $"条码：{task.PalletCode},任务号：{task.TaskNum}", $"调取wms任务反馈：{JsonConvert.SerializeObject(content)}");

                    task.ModifyDate = DateTime.Now;
                    BaseDal.DeleteData(task);
@@ -814,6 +797,16 @@
            return content;
        }

        public WebResponseContent StackCraneTashty(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();
            int taskcount = _task_HtyRepository.QueryData(x =>x.TaskNum == taskNum && x.CreateDate >= DateTime.Now.AddMinutes(-30)).Count();

            if (taskcount>0) return WebResponseContent.Instance.OK();

             return WebResponseContent.Instance.Error($"未找到该任务信息，时间不在范围内,任务号为：{taskNum}");
        }

        /// <summary>
        /// æ¢å¤æŒ‚起任务
        /// </summary>