1

huangxiaoqiang

8 天以前 644cbe3e4eba765affa25454d69fee6286bb6094

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -44,19 +44,32 @@

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


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


        #region èŽ·å–所有任务类型、状态
        public List<int> TaskInboundTypes => typeof(TaskInboundTypeEnum).GetEnumIndexList();

        public List<int> TaskOutboundTypes => typeof(TaskOutboundTypeEnum).GetEnumIndexList();
        public List<int> TaskRelocationboundTypes => typeof(TaskRelocationStatusEnum).GetEnumIndexList();
        public List<int> TaskAGVCarryboundTypes => typeof(TaskAGVCarryStatusEnum).GetEnumIndexList();
        public List<int> TaskAcrossFloorboundTypes => typeof(TaskAcrossFloorStatusEnum).GetEnumIndexList();
        public List<int> TaskRelocationboundTypes => typeof(TaskRelocationTypeEnum).GetEnumIndexList();
        public List<int> TaskAGVCarryboundTypes => typeof(TaskAGVCarryTypeEnum).GetEnumIndexList();
        public List<int> TaskAcrossFloorboundTypes => typeof(TaskAcrossFloorTypeEnum).GetEnumIndexList();

        public List<int> TaskInboundStates => typeof(TaskInStatusEnum).GetEnumIndexList();

        public List<int> TaskOutboundStates => typeof(TaskOutStatusEnum).GetEnumIndexList();
        public List<int> TaskRelocationboundStates => typeof(TaskRelocationStatusEnum).GetEnumIndexList();
        public List<int> TaskAGVCarryboundStates => typeof(TaskAGVCarryStatusEnum).GetEnumIndexList();
        public List<int> TaskAcrossFloorboundStates => typeof(TaskAcrossFloorStatusEnum).GetEnumIndexList();

        #endregion èŽ·å–所有任务类型、状态


        public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ISys_ConfigService sys_ConfigService, IDt_StationManagerService stationManagerService, IDt_StationManagerRepository stationManagerRepository, IRouterRepository routerRepository, ITask_HtyRepository htyRepository) : base(BaseDal)
        {
@@ -100,78 +113,179 @@
                    // åˆ¤æ–­ä»»åŠ¡ç±»åž‹æ˜¯å¦ä¸ºå‡ºåº“任务
                    if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                    {
                        var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");

                        task.TaskState = (int)TaskOutStatusEnum.OutNew;

                        task.CurrentAddress = item.SourceAddress;

                        task.NextAddress = station.stationChildCode;

                        task.Floor = "1F";

                        task.AGVSign = "";
                    }
                    // åˆ¤æ–­ä»»åŠ¡ç±»åž‹æ˜¯å¦ä¸ºå…¥åº“任务
                    else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                    {
                        var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");

                        task.TaskState = (int)TaskInStatusEnum.InNew;

                        task.CurrentAddress = item.SourceAddress;

                        task.NextAddress = station.stationChildCode;

                        task.Floor = "1F";

                        task.AGVSign= "";
                    }
                    else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
                    {
                        task.TaskState = (int)TaskRelocationStatusEnum.RelocationNew;

                        task.CurrentAddress = item.SourceAddress;

                        task.NextAddress = task.TargetAddress;

                        task.Floor = "1F";

                        task.AGVSign = "";
                    }
                    else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.CarryGroup)
                    {
                        var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);

                        task.TaskState = (int)TaskAGVCarryStatusEnum.CarryNew;

                        task.CurrentAddress = item.SourceAddress;

                        task.NextAddress = task.TargetAddress;

                        task.Floor = station.stationFloor;

                        task.AGVSign = "";
                    }
                    else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.AcrossFloorGroup)
                    {
                        var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);

                        if (station != null)
                        if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.OutbondGroup)
                        {
                            var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == station.stationFloor);
                            var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");

                            task.TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew;
                            task.TaskState = (int)TaskOutStatusEnum.OutNew;

                            task.CurrentAddress = item.SourceAddress;

                            task.NextAddress = next.stationChildCode;
                            task.NextAddress = station.stationChildCode;

                            task.Floor = "1F";

                            task.AGVSign = "";
                        }
                        else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.AcrossFloorGroup)
                        {
                            var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);

                            if (station != null)
                            {
                                var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == station.stationFloor);

                                task.TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew;

                                task.CurrentAddress = item.SourceAddress;

                                task.NextAddress = next.stationChildCode;

                                task.Floor = station.stationFloor;

                                task.AGVSign = "";
                            }
                        }
                        else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
                        {
                            var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.TargetAddress);

                            task.TaskState = (int)TaskAGVCarryStatusEnum.CarryNew;

                            task.CurrentAddress = item.SourceAddress;

                            task.NextAddress = task.TargetAddress;

                            task.Floor = station.stationFloor;

                            task.AGVSign = "";
                        }
                    }
                    // åˆ¤æ–­ä»»åŠ¡ç±»åž‹æ˜¯å¦ä¸ºå…¥åº“任务
                    else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                    {
                        if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.InboundGroup)
                        {
                            var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");

                            task.TaskState = (int)TaskInStatusEnum.InNew;

                            task.CurrentAddress = item.SourceAddress;

                            task.NextAddress = station.stationChildCode;

                            task.Floor = "1F";

                            task.AGVSign = "";
                        }
                        else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.AcrossFloorGroup)
                        {
                            var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);

                            if (station != null)
                            {
                                var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == station.stationFloor);

                                task.TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew;

                                task.CurrentAddress = item.SourceAddress;

                                task.NextAddress = next.stationChildCode;

                                task.Floor = station.stationFloor;

                                task.AGVSign = "";
                            }
                        }
                        else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
                        {
                            var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);

                            task.TaskState = (int)TaskAGVCarryStatusEnum.CarryNew;

                            task.CurrentAddress = item.SourceAddress;

                            task.NextAddress = task.TargetAddress;

                            task.Floor = station.stationFloor;

                            task.AGVSign = "";
                        }

                    }
                    // åˆ¤æ–­ä»»åŠ¡ç±»åž‹æ˜¯å¦ä¸ºç§»åº“任务
                    else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
                    {
                        if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.RelocationGroup)
                        {
                            task.TaskState = (int)TaskRelocationStatusEnum.RelocationNew;

                            task.CurrentAddress = item.SourceAddress;

                            task.NextAddress = task.TargetAddress;

                            task.Floor = "1F";

                            task.AGVSign = "";
                        }
                        else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.AcrossFloorGroup)
                        {
                            var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);

                            if (station != null)
                            {
                                var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == station.stationFloor);

                                task.TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew;

                                task.CurrentAddress = item.SourceAddress;

                                task.NextAddress = next.stationChildCode;

                                task.Floor = station.stationFloor;

                                task.AGVSign = "";
                            }
                        }
                        else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
                        {
                            var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);

                            task.TaskState = (int)TaskAGVCarryStatusEnum.CarryNew;

                            task.CurrentAddress = item.SourceAddress;

                            task.NextAddress = task.TargetAddress;

                            task.Floor = station.stationFloor;

                            task.AGVSign = "";
                        }
                    }
                    //判断任务类型是否为跨楼层搬运任务
                    else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.AcrossFloorGroup)
                    {
                        if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.AcrossFloorGroup)
                        {
                            var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);

                            if (station != null)
                            {
                                var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == station.stationFloor);

                                task.TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew;

                                task.CurrentAddress = item.SourceAddress;

                                task.NextAddress = next.stationChildCode;

                                task.Floor = station.stationFloor;

                                task.AGVSign = "";
                            }
                        }
                    }

                    // å°†è½¬æ¢åŽçš„任务添加到任务列表中
                    tasks.Add(task);
                }
@@ -273,7 +387,7 @@
        /// <returns></returns>
        public Dt_Task QueryRequestTSJSignalTask()
        {
            return BaseDal.QueryFirst(x => TaskAcrossFloorboundTypes.Contains(x.TaskType) && x.TaskState > (int)TaskAcrossFloorStatusEnum.CarryNew && (x.AGVSign == "RequestPickUp" || x.AGVSign == "RequestPut"));
            return BaseDal.QueryFirst(x =>  x.TaskState > (int)TaskAcrossFloorStatusEnum.CarryNew && (x.AGVSign == "RequestPickUp" || x.AGVSign == "RequestPut"));
        }

        #endregion
@@ -346,7 +460,7 @@
            try
            {
                int oldState = task.TaskState;
                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.OutbondGroup)
                {
                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();

@@ -371,8 +485,14 @@
                        content = StackCraneTaskCompleted(task.TaskNum);
                        return content;
                    }
                    if (task.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
                    {
                        var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.TargetAddress);
                        SendAgvTask(station.stationRemark, task.TaskNum);
                    }

                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.InboundGroup)
                {
                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
                    task.TaskState = nextStatus;
@@ -404,7 +524,7 @@
                        //// ååºåˆ—化响应内容
                        //content = JsonConvert.DeserializeObject<WebResponseContent>(abc);

                        //LogFactory.WriteError($"Info_获取货位", $"获取货位,任务号:【{task.TaskNum}】,托盘号：【{task.PalletCode}】返回参数【{JsonConvert.SerializeObject(content)}】{Environment.NewLine}{Environment.NewLine}");
                        //LogFactory.WriteError($"获取货位", $"获取货位,任务号:【{task.TaskNum}】,托盘号：【{task.PalletCode}】返回参数【{JsonConvert.SerializeObject(content)}】");

                        //// æ£€æŸ¥çŠ¶æ€å¹¶è¿”回
                        //if (!content.Status)
@@ -426,7 +546,6 @@
                        if (App.User.UserId > 0)
                        {
                            content = StackCraneTaskCompleted(task.TaskNum);
                            return content;
                        }

                        task.ModifyDate = DateTime.Now;
@@ -439,7 +558,7 @@
                        _taskHtyRepository.AddData(task_Hty);
                    }
                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.CarryGroup)
                else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
                {
                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskAGVCarryStatusEnum>();

@@ -447,6 +566,8 @@

                    if (task.TaskState == (int)TaskAGVCarryStatusEnum.AGV_CarryFinish)
                    {
                        CompletedTask(task.TaskNum);

                        task.ModifyDate = DateTime.Now;
                        task.Modifier = "System";

@@ -457,7 +578,7 @@
                        _taskHtyRepository.AddData(task_Hty);
                    }
                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.AcrossFloorGroup)
                else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.AcrossFloorGroup)
                {
                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskAcrossFloorStatusEnum>();

@@ -492,7 +613,7 @@
                            stationManager = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == "1F");
                            TaskTemplate = "CCC";
                        }
                       

                        var taskDto = new RequestAcrossFloorTaskDto()
                        {
                            NextAddress = task.NextAddress,
@@ -547,22 +668,6 @@
                        BaseDal.AddData(taskNew);

                        SendAgvTask(TaskTemplate, taskNew.TaskNum);
                        return content.OK();
                    }

                    if (task.TaskState == (int)TaskAGVCarryStatusEnum.AGV_CarryFinish)
                    {

                        CompletedTask(task.TaskNum);

                        task.ModifyDate = DateTime.Now;
                        task.Modifier = "System";

                        Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
                        task_Hty.TaskId = 0;

                        BaseDal.DeleteData(task);
                        _taskHtyRepository.AddData(task_Hty);
                    }
                }
                else
@@ -655,6 +760,8 @@
                    task.Modifier = "System";
                    BaseDal.UpdateData(task);

                    content.OK(data: task);

                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机出库完成");
                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)