1

hutongqing

2024-08-26 a4122d504f8fc5f0626eaa0cbc270b47742812d9

 WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -44,6 +44,18 @@
        private readonly ITaskExecuteDetailRepository _taskExecuteDetailRepository;
        private readonly IMapper _mapper;

        private Dictionary<string, OrderByType> _taskOrderBy = new()
            {
                {nameof(Dt_Task.Grade),OrderByType.Desc },
                {nameof(Dt_Task.CreateDate),OrderByType.Asc},
            };

        public Dictionary<string, OrderByType> TaskOrderBy { get { return _taskOrderBy; } set { _taskOrderBy = value; } }

        public List<int> TaskInboundTypes => typeof(TaskInboundTypeEnum).GetEnumIndexList();

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

        public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper) : base(BaseDal)
        {
            _routerService = routerService;
@@ -71,7 +83,7 @@
                    }
                    Dt_Task task = _mapper.Map<Dt_Task>(item);
                    task.Creater = "WMS";
                    if (!int.TryParse(Enum.Parse<TaskOutboundTypeEnum>(task.TaskType.ToString()).ToString(), out int result))
                    if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                    {
                        List<Dt_Router> routers = _routerService.QueryNextRoutes(item.RoadWay, item.TargetAddress);
                        //暂不考虑多路径
@@ -83,7 +95,7 @@

                        }
                    }
                    else if (!int.TryParse(Enum.Parse<TaskInboundTypeEnum>(task.TaskType.ToString()).ToString(), out result))
                    else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                    {
                        List<Dt_Router> routers = _routerService.QueryNextRoutes(item.SourceAddress, item.TargetAddress);
                        //暂不考虑多路径
@@ -94,11 +106,7 @@
                            task.NextAddress = routers.FirstOrDefault().ChildPosi;
                        }
                    }
                    else if (!int.TryParse(Enum.Parse<TaskRelocationTypeEnum>(task.TaskType.ToString()).ToString(), out result))
                    {

                    }
                    else if (!int.TryParse(Enum.Parse<TaskOtherTypeEnum>(task.TaskType.ToString()).ToString(), out result))
                    else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
                    {

                    }
@@ -151,38 +159,17 @@

        public Dt_Task QueryConveyorLineTask(string deviceNo, string currentAddress)
        {
            IEnumerable<int> taskInboundTypes = Enum.GetValues(typeof(TaskInboundTypeEnum)).Cast<int>();
            IEnumerable<int> taskOutboundTypes = Enum.GetValues(typeof(TaskOutboundTypeEnum)).Cast<int>();

            Dictionary<string, OrderByType> orderBy = new()
            {
                {nameof(Dt_Task.Grade),OrderByType.Desc },
                {nameof(Dt_Task.CreateDate),OrderByType.Asc},
            };

            return BaseDal.QueryFirst(x => (x.TaskType >= taskInboundTypes.Min() && x.TaskType <= taskInboundTypes.Max() && x.TaskState == (int)TaskInStatusEnum.InNew || x.TaskType >= taskOutboundTypes.Min() && x.TaskType <= taskOutboundTypes.Max() && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish) && x.CurrentAddress == currentAddress, orderBy);
            return BaseDal.QueryFirst(x => (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew || TaskOutboundTypes.Contains( x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish) && x.CurrentAddress == currentAddress, TaskOrderBy);
        }

        public Dt_Task QueryExecutingConveyorLineTask(int taskNum, string nextAddress)
        {
            Dictionary<string, OrderByType> orderBy = new()
            {
                {nameof(Dt_Task.Grade),OrderByType.Desc },
                {nameof(Dt_Task.CreateDate),OrderByType.Asc},
            };

            return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.NextAddress == nextAddress, orderBy);
            return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.NextAddress == nextAddress, TaskOrderBy);
        }

        public Dt_Task QueryCompletedConveyorLineTask(int taskNum, string currentAddress)
        {
            Dictionary<string, OrderByType> orderBy = new()
            {
                {nameof(Dt_Task.Grade),OrderByType.Desc },
                {nameof(Dt_Task.CreateDate),OrderByType.Asc},
            };

            return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.CurrentAddress == currentAddress, orderBy);
            return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.CurrentAddress == currentAddress, TaskOrderBy);
        }

        /// <summary>
@@ -193,19 +180,10 @@
        /// <returns>返回任务实体对象，可能为null</returns>
        public Dt_Task QueryStackerCraneTask(string deviceNo, string currentAddress = "")
        {
            IEnumerable<int> taskInboundTypes = Enum.GetValues(typeof(TaskInboundTypeEnum)).Cast<int>();
            IEnumerable<int> taskOutboundTypes = Enum.GetValues(typeof(TaskOutboundTypeEnum)).Cast<int>();

            Dictionary<string, OrderByType> orderBy = new()
            {
                {nameof(Dt_Task.Grade),OrderByType.Desc },
                {nameof(Dt_Task.CreateDate),OrderByType.Asc},
            };

            if (string.IsNullOrEmpty(currentAddress))
                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && (x.TaskType >= taskInboundTypes.Min() && x.TaskType <= taskInboundTypes.Max() && x.TaskState == (int)TaskInStatusEnum.Line_InFinish || x.TaskType >= taskOutboundTypes.Min() && x.TaskType <= taskOutboundTypes.Max() && x.TaskState == (int)TaskOutStatusEnum.OutNew), orderBy);
                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew), TaskOrderBy);
            else
                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.CurrentAddress == currentAddress && (x.TaskType >= taskInboundTypes.Min() && x.TaskType <= taskInboundTypes.Max() && x.TaskState == (int)TaskInStatusEnum.Line_InFinish || x.TaskType >= taskOutboundTypes.Min() && x.TaskType <= taskOutboundTypes.Max() && x.TaskState == (int)TaskOutStatusEnum.OutNew), orderBy);
                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.CurrentAddress == currentAddress && (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew), TaskOrderBy);
        }

        /// <summary>
@@ -216,18 +194,10 @@
        /// <returns>返回任务实体对象，可能为null</returns>
        public Dt_Task QueryStackerCraneInTask(string deviceNo, string currentAddress = "")
        {
            IEnumerable<int> taskInboundTypes = Enum.GetValues(typeof(TaskInboundTypeEnum)).Cast<int>();

            Dictionary<string, OrderByType> orderBy = new()
            {
                {nameof(Dt_Task.Grade),OrderByType.Desc },
                {nameof(Dt_Task.CreateDate),OrderByType.Asc},
            };

            if (string.IsNullOrEmpty(currentAddress))
                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskType >= taskInboundTypes.Min() && x.TaskType <= taskInboundTypes.Max() && x.TaskState == (int)TaskInStatusEnum.Line_InFinish, orderBy);
                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish, TaskOrderBy);
            else
                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskType >= taskInboundTypes.Min() && x.TaskType <= taskInboundTypes.Max() && x.TaskState == (int)TaskInStatusEnum.Line_InFinish && x.CurrentAddress == currentAddress, orderBy);
                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish && x.CurrentAddress == currentAddress, TaskOrderBy);
        }

        /// <summary>
@@ -238,18 +208,10 @@
        /// <returns>返回任务实体对象，可能为null</returns>
        public Dt_Task QueryStackerCraneOutTask(string deviceNo, string currentAddress = "")
        {
            IEnumerable<int> taskInboundTypes = Enum.GetValues(typeof(TaskOutboundTypeEnum)).Cast<int>();

            Dictionary<string, OrderByType> orderBy = new()
            {
                {nameof(Dt_Task.Grade),OrderByType.Desc },
                {nameof(Dt_Task.CreateDate),OrderByType.Asc},
            };

            if (string.IsNullOrEmpty(currentAddress))
                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskType >= taskInboundTypes.Min() && x.TaskType <= taskInboundTypes.Max() && x.TaskState == (int)TaskOutStatusEnum.OutNew, orderBy);
                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew, TaskOrderBy);
            else
                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskType >= taskInboundTypes.Min() && x.TaskType <= taskInboundTypes.Max() && x.TaskState == (int)TaskOutStatusEnum.OutNew && x.CurrentAddress == currentAddress, orderBy);
                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew && x.CurrentAddress == currentAddress, TaskOrderBy);
        }

        /// <summary>
@@ -260,14 +222,7 @@
        /// <returns>返回任务实体对象集合，可能为null</returns>
        public List<Dt_Task> QueryStackerCraneOutTasks(string deviceNo, List<string> outStationCodes)
        {
            IEnumerable<int> taskInboundTypes = Enum.GetValues(typeof(TaskOutboundTypeEnum)).Cast<int>();

            Dictionary<string, OrderByType> orderBy = new()
            {
                {nameof(Dt_Task.Grade),OrderByType.Desc },
                {nameof(Dt_Task.CreateDate),OrderByType.Asc},
            };
            return BaseDal.QueryData(x => x.Roadway == deviceNo && x.TaskType >= taskInboundTypes.Min() && x.TaskType <= taskInboundTypes.Max() && x.TaskState == (int)TaskOutStatusEnum.OutNew && outStationCodes.Contains(x.CurrentAddress), orderBy);
            return BaseDal.QueryData(x => x.Roadway == deviceNo && TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew && outStationCodes.Contains(x.CurrentAddress), TaskOrderBy);
        }

        /// <summary>
@@ -282,11 +237,11 @@
            {
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");
                if (!int.TryParse(Enum.Parse<TaskOutboundTypeEnum>(task.TaskType.ToString()).ToString(), out int result))
                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                {
                    task.TaskState = (int)TaskOutStatusEnum.OutPending;
                }
                else if (!int.TryParse(Enum.Parse<TaskInStatusEnum>(task.TaskType.ToString()).ToString(), out result))
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                {
                    task.TaskState = (int)TaskInStatusEnum.InPending;
                }
@@ -331,26 +286,25 @@
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");
                int oldState = task.TaskState;
                if (!int.TryParse(Enum.Parse<TaskOutboundTypeEnum>(task.TaskType.ToString()).ToString(), out int result))
                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                {
                    if (task.TaskState >= (int)TaskOutStatusEnum.OutFinish)
                    {
                        return content = WebResponseContent.Instance.Error($"该任务状态不可跳转到下一步,任务号:【{taskNum}】,任务状态:【{task.TaskState}】");
                    }

                    List<int> list = Enum.GetValues(typeof(TaskOutStatusEnum)).Cast<int>().ToList();
                    int nextStatus = list.Where(x => x > task.TaskState && x < (int)TaskOutStatusEnum.OutFinish).OrderBy(x => x).FirstOrDefault();
                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();

                    task.TaskState = nextStatus;
                }
                else if (!int.TryParse(Enum.Parse<TaskInboundTypeEnum>(task.TaskType.ToString()).ToString(), out result))
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                {
                    if (task.TaskState >= (int)TaskInStatusEnum.InFinish)
                    {
                        return content = WebResponseContent.Instance.Error($"该任务状态不可跳转到下一步,任务号:【{taskNum}】,任务状态:【{task.TaskState}】");
                    }

                    int nextStatus = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().Where(x => x > task.TaskState && x < (int)TaskInStatusEnum.InFinish).OrderBy(x => x).FirstOrDefault();
                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
                    task.TaskState = nextStatus;

                    if (task.TaskState == (int)TaskInStatusEnum.Line_InFinish)
@@ -361,11 +315,11 @@
                        task.TargetAddress = task.NextAddress;
                    }
                }
                else if (!int.TryParse(Enum.Parse<TaskRelocationTypeEnum>(task.TaskType.ToString()).ToString(), out result))
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
                {
                    //todo 调用WMS移库完成
                }
                else if (!int.TryParse(Enum.Parse<TaskOtherTypeEnum>(task.TaskType.ToString()).ToString(), out result))
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OtherGroup)
                {

                }
@@ -436,13 +390,12 @@
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");

                if (!int.TryParse(Enum.Parse<TaskOutboundTypeEnum>(task.TaskType.ToString()).ToString(), out int result) && task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup && task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
                {
                    List<Dt_Router> routers = _routerService.QueryNextRoutes(task.NextAddress, task.TargetAddress);
                    if (!routers.Any()) return WebResponseContent.Instance.Error($"未找到设备路由信息");

                    List<int> enums = Enum.GetValues(typeof(TaskOutStatusEnum)).Cast<int>().ToList();
                    int nextStatus = enums.Where(x => x > task.TaskState).OrderBy(x => x).FirstOrDefault();
                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
                    task.TaskState = nextStatus;
                    task.CurrentAddress = task.NextAddress;
                    task.NextAddress = routers.FirstOrDefault().ChildPosi;
@@ -455,10 +408,10 @@

                    //暂不考虑多个出库口
                }
                else if (!int.TryParse(Enum.Parse<TaskInboundTypeEnum>(task.TaskType.ToString()).ToString(), out result) && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
                {
                    //todo 
                    int nextStatus = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().Where(x => x > task.TaskState).OrderBy(x => x).FirstOrDefault();
                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
                    task.TaskState = nextStatus;
                    task.ModifyDate = DateTime.Now;
                    task.Modifier = "System";
@@ -480,11 +433,11 @@

                    content = ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
                }
                else if (!int.TryParse(Enum.Parse<TaskRelocationTypeEnum>(task.TaskType.ToString()).ToString(), out result))
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
                {
                    //todo 调用WMS移库完成
                }
                else if (!int.TryParse(Enum.Parse<TaskOtherTypeEnum>(task.TaskType.ToString()).ToString(), out result))
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OtherGroup)
                {

                }
@@ -525,11 +478,11 @@
                }
                else
                {
                    if (!int.TryParse(Enum.Parse<TaskOutboundTypeEnum>(task.TaskType.ToString()).ToString(), out int result))
                    if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                    {
                        task.TaskState = (int)TaskOutStatusEnum.OutNew;
                    }
                    else if (!int.TryParse(Enum.Parse<TaskInboundTypeEnum>(task.TaskType.ToString()).ToString(), out result))
                    else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                    {
                        task.TaskState = (int)TaskInStatusEnum.InNew;
                    }
@@ -575,35 +528,6 @@
                else
                {
                    return content = WebResponseContent.Instance.Error($"未找到任务明细信息,该任务状态不可回滚到上一步,任务号:【{taskNum}】,任务状态:【{task.TaskState}】");

                    //if (!int.TryParse(Enum.Parse<TaskOutboundTypeEnum>(task.TaskType.ToString()).ToString(), out int result))
                    //{
                    //    if (task.TaskState >= (int)TaskOutStatusEnum.OutFinish || task.TaskState == (int)TaskOutStatusEnum.OutNew)
                    //    {
                    //        return content = WebResponseContent.Instance.Error($"该任务状态不可回滚到上一步,任务号:【{taskNum}】,任务状态:【{task.TaskState}】");
                    //    }
                    //    List<int> list = Enum.GetValues(typeof(TaskOutStatusEnum)).Cast<int>().ToList();
                    //    int preStatus = list.Where(x => x > (int)TaskOutStatusEnum.OutNew && x < task.TaskState).OrderBy(x => x).FirstOrDefault();
                    //    task.TaskState = preStatus;
                    //}
                    //else if (!int.TryParse(Enum.Parse<TaskInboundTypeEnum>(task.TaskType.ToString()).ToString(), out result))
                    //{
                    //    if (task.TaskState >= (int)TaskInStatusEnum.InFinish || task.TaskState == (int)TaskInStatusEnum.InNew)
                    //    {
                    //        return content = WebResponseContent.Instance.Error($"该任务状态不可回滚到上一步,任务号:【{taskNum}】,任务状态:【{task.TaskState}】");
                    //    }
                    //    List<int> list = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().ToList();
                    //    int preStatus = list.Where(x => x > (int)TaskInStatusEnum.InNew && x < task.TaskState).OrderBy(x => x).FirstOrDefault();
                    //    task.TaskState = preStatus;
                    //}

                    //List<Dt_Router> routers = _routerService.QueryNextRoutes(task.NextAddress, task.CurrentAddress);
                    //if (!routers.Any()) return WebResponseContent.Instance.Error($"未找到设备路由信息");

                    //task.CurrentAddress = task.NextAddress;
                    //task.NextAddress = task.CurrentAddress;

                    //todo
                }

                task.ExceptionMessage = string.Empty;