1

huangxiaoqiang

2025-11-10 8f7e6826d51a25c7b368c210dbb321d423d24a85

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

@@ -3,6 +3,7 @@
using LogLibrary.Log;
using Mapster;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
@@ -123,28 +124,23 @@

                            task.NextAddress = station.stationChildCode;

                            task.Floor = "1F";
                            task.Floor = item.Floor;

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

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

                                task.TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew;
                            task.CurrentAddress = item.SourceAddress;

                                task.CurrentAddress = item.SourceAddress;
                            task.NextAddress = next.stationChildCode;

                                task.NextAddress = next.stationChildCode;
                            task.Floor = item.Floor;

                                task.Floor = station.stationFloor;

                                task.AGVSign = "";
                            }
                            task.AGVSign = "";
                        }
                        else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
                        {
@@ -180,22 +176,17 @@
                        }
                        else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.AcrossFloorGroup)
                        {
                            var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);
                            var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == item.Floor);

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

                                task.TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew;
                            task.CurrentAddress = item.SourceAddress;

                                task.CurrentAddress = item.SourceAddress;
                            task.NextAddress = next.stationChildCode;

                                task.NextAddress = next.stationChildCode;
                            task.Floor = item.Floor;

                                task.Floor = station.stationFloor;

                                task.AGVSign = "";
                            }
                            task.AGVSign = "";
                        }
                        else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
                        {
@@ -230,26 +221,20 @@
                        }
                        else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.AcrossFloorGroup)
                        {
                            var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);
                            var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == item.Floor);

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

                                task.TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew;
                            task.CurrentAddress = item.SourceAddress;

                                task.CurrentAddress = item.SourceAddress;
                            task.NextAddress = next.stationChildCode;

                                task.NextAddress = next.stationChildCode;
                            task.Floor = item.Floor;

                                task.Floor = station.stationFloor;

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

                            task.TaskState = (int)TaskAGVCarryStatusEnum.CarryNew;

@@ -257,7 +242,7 @@

                            task.NextAddress = task.TargetAddress;

                            task.Floor = station.stationFloor;
                            task.Floor = item.Floor;

                            task.AGVSign = "";
                        }
@@ -267,23 +252,19 @@
                    {
                        if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.AcrossFloorGroup)
                        {
                            var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);
                            var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == item.Floor);

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

                                task.TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew;
                            task.CurrentAddress = item.SourceAddress;

                                task.CurrentAddress = item.SourceAddress;
                            task.NextAddress = next.stationChildCode;

                                task.NextAddress = next.stationChildCode;
                            task.Floor = item.Floor;

                                task.Floor = station.stationFloor;

                                task.AGVSign = "";
                            }
                            task.AGVSign = "";
                        }

                    }

                    // å°†è½¬æ¢åŽçš„任务添加到任务列表中