百步立体仓库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
刘磊
2024-12-13 375ca5b5c67b377d3a9133a60994c76997c5d9d9 
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs


@@ -1,54 +1,51 @@


#region << 版 本 注 释 >>




/*----------------------------------------------------------------


 * 命名空间：WIDESEAWCS_TaskInfoService


 * 创建者：胡童庆


 * 创建时间：2024/8/2 16:13:36


 * 版本：V1.0.0


 * 描述：


 *


 * ----------------------------------------------------------------


 * 修改人：


 * 修改时间：


 * 版本：V1.0.1


 * 修改说明：


 *


 *----------------------------------------------------------------*/




#endregion << 版 本 注 释 >>







using AutoMapper;


using HslCommunication;


using Mapster;


using Microsoft.AspNetCore.Components.Routing;


using Newtonsoft.Json;


using SqlSugar;


using System.Diagnostics.CodeAnalysis;


using System.Threading.Tasks;


using WIDESEAWCS_BasicInfoRepository;


using WIDESEAWCS_BasicInfoService;


using WIDESEAWCS_Common;


using WIDESEAWCS_Common.TaskEnum;


using WIDESEAWCS_Core;


using WIDESEAWCS_Core.BaseServices;


using WIDESEAWCS_Core.Helper;


using WIDESEAWCS_DTO.TaskInfo;


using WIDESEAWCS_DTO.WMS;


using WIDESEAWCS_ISystemServices;


using WIDESEAWCS_ITaskInfo_HtyRepository;


using WIDESEAWCS_ITaskInfoRepository;


using WIDESEAWCS_ITaskInfoService;


using WIDESEAWCS_Model.Models;


using WIDESEAWCS_QuartzJob;


using WIDESEAWCS_QuartzJob.DeviceBase;


using WIDESEAWCS_QuartzJob.Models;


using WIDESEAWCS_QuartzJob.Repository;


using WIDESEAWCS_QuartzJob.Service;




namespace WIDESEAWCS_TaskInfoService


{


    public class TaskService : ServiceBase<Dt_Task, ITaskRepository>, ITaskService


    public partial class TaskService : ServiceBase<Dt_Task, ITaskRepository>, ITaskService


    {


        private readonly IRouterService _routerService;


        private readonly ITaskExecuteDetailService _taskExecuteDetailService;


        private readonly ITaskExecuteDetailRepository _taskExecuteDetailRepository;


        private readonly ISys_ConfigService _sys_ConfigService;


        private readonly IMapper _mapper;


        private readonly IDt_StationManagerService _stationManagerService;


        private readonly IDt_StationManagerRepository _stationManagerRepository;


        private readonly IRouterRepository _routerRepository;


        private readonly ITask_HtyRepository _taskHtyRepository;




        private Dictionary<string, OrderByType> _taskOrderBy = new()


            {


                {nameof(Dt_Task.Grade),OrderByType.Desc },


                {nameof(Dt_Task.CreateDate),OrderByType.Asc},


            };


        {


            {nameof(Dt_Task.Grade), OrderByType.Desc },


            {nameof(Dt_Task.CreateDate), OrderByType.Asc},


        };




        public Dictionary<string, OrderByType> TaskOrderBy


        { get { return _taskOrderBy; } set { _taskOrderBy = value; } }


@@ -57,12 +54,17 @@




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




        public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper) : base(BaseDal)


        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)


        {


            _routerService = routerService;


            _taskExecuteDetailService = taskExecuteDetailService;


            _taskExecuteDetailRepository = taskExecuteDetailRepository;


            _mapper = mapper;


            _sys_ConfigService = sys_ConfigService;


            _stationManagerService = stationManagerService;


            _stationManagerRepository = stationManagerRepository;


            _routerRepository = routerRepository;


            _taskHtyRepository = htyRepository;


        }




        /// <summary>


@@ -87,18 +89,26 @@


                    if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)


                    {


                        List<Dt_Router> routers = _routerService.QueryNextRoutes(item.RoadWay, item.TargetAddress);


                        //暂不考虑多路径


                        if (routers.Count > 0)


                        {


                            task.TaskState = (int)TaskOutStatusEnum.OutNew;


                            task.CurrentAddress = item.SourceAddress;


                            task.NextAddress = routers.FirstOrDefault().ChildPosi;


                        }


                        else


                        {


                            routers = _routerService.QueryNextRoutes(item.SourceAddress, item.TargetAddress);


                            if (routers.Count > 0)


                            {


                                task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;


                                task.CurrentAddress = item.SourceAddress;


                                task.NextAddress = routers.FirstOrDefault().ChildPosi;


                            }


                        }


                    }


                    else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)


                    {


                        List<Dt_Router> routers = _routerService.QueryNextRoutes(item.SourceAddress, item.TargetAddress);


                        //暂不考虑多路径


                        if (routers.Count > 0)


                        {


                            task.TaskState = (int)TaskInStatusEnum.InNew;


@@ -127,71 +137,42 @@


        /// <param name="palletCode">托盘号</param>


        /// <param name="sourceAddress">起始地址</param>


        /// <returns></returns>


        public WebResponseContent RequestWMSTask(string palletCode, string sourceAddress)


        public async Task<WebResponseContent> RequestWMSTask(string palletCode, string sourceAddress)


        {


            WebResponseContent content = new WebResponseContent();


            try


            {


                var hasTask = BaseDal.QueryFirst(x => x.PalletCode == palletCode);


                var hasTask = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);


                if (hasTask != null)


                {


                    return content;


                    return content.OK("当前托盘存在任务");


                }


                #region 请求入库任务巷道


                // TODO: 调用接口获取下一个地址


                // 创建请求对象


                RequestTaskDto request = new RequestTaskDto()




                var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);


                var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;


                var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.RequestTask)?.ConfigValue;


                if (wmsBase == null || requestTask == null)


                {


                    Position = sourceAddress,


                    PalletCode = palletCode,


                };


                    throw new InvalidOperationException("WMS IP 未配置");


                }


                var wmsIpAddrss = wmsBase + requestTask;




                // 发送请求并等待响应


                var result = HttpHelper.PostAsync("http://127.0.0.1:5000/api/Task/RequestTaskAsync", request.ToJsonString()).Result;




                // 反序列化响应内容


                var result = await HttpHelper.PostAsync(wmsIpAddrss, new { Position = sourceAddress, PalletCode = palletCode }.ToJsonString());


                content = JsonConvert.DeserializeObject<WebResponseContent>(result);




                WMSTaskDTO task = new WMSTaskDTO();


                // 检查状态并返回


                if (!content.Status)


                {


                    task = new WMSTaskDTO()


                    {


                        TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")),


                        Grade = 1,


                        PalletCode = palletCode,


                        RoadWay = "CHSC01",


                        SourceAddress = sourceAddress,


                        TargetAddress = "1020",


                        TaskState = (int)TaskOutStatusEnum.Line_OutExecuting,


                        Id = 0,


                        TaskType = (int)TaskOutboundTypeEnum.Outbound


                    };




                    Dt_Task task1 = _mapper.Map<Dt_Task>(task);


                    task1.CurrentAddress = task.SourceAddress;


                    task1.NextAddress = "1020";


                    BaseDal.AddData(task1);


                    return content.OK();


                }


                else


                {


                    // 反序列化任务数据


                    task = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());


                    // 处理任务并返回结果


                    content = ReceiveWMSTask(new List<WMSTaskDTO> { task });


                    // wms失败返回去NG口任务


                    return content;


                }








                #endregion


                var task = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());


                return ReceiveWMSTask(new List<WMSTaskDTO> { task });


            }


            catch (Exception ex)


            {


                content = WebResponseContent.Instance.Error(ex.Message);


                return WebResponseContent.Instance.Error(ex.Message);


            }


            return content;


        }




        /// <summary>


@@ -340,7 +321,7 @@


            WebResponseContent content = new WebResponseContent();


            try


            {


                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);


                var task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);


                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");


                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)


                {


@@ -372,7 +353,7 @@


        /// <param name="status">任务状态</param>


        public void UpdateTaskStatus(int taskNum, int status)


        {


            Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);


            var task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);


            if (task == null) return;


            task.TaskState = status;


            task.ModifyDate = DateTime.Now;


@@ -388,7 +369,7 @@


            WebResponseContent content = new WebResponseContent();


            try


            {


                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);


                var task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);


                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");


                return UpdateTaskStatusToNext(task);


            }


@@ -412,11 +393,6 @@


                int oldState = task.TaskState;


                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)


                {


                    //if (task.TaskState >= (int)TaskOutStatusEnum.OutFinish)


                    //{


                    //    return content = WebResponseContent.Instance.Error($"该任务状态不可跳转到下一步,任务号:【{task.TaskNum}】,任务状态:【{task.TaskState}】");


                    //}




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




                    task.TaskState = nextStatus;


@@ -425,16 +401,16 @@


                    {


                        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 if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)


                {


                    //if (task.TaskState >= (int)TaskInStatusEnum.InFinish)


                    //{


                    //    return content = WebResponseContent.Instance.Error($"该任务状态不可跳转到下一步,任务号:【{task.TaskNum}】,任务状态:【{task.TaskState}】");


                    //}




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


                    task.TaskState = nextStatus;




@@ -444,14 +420,24 @@


                        #region 入库调用接口获取货位地址


                        // TODO: 调用接口获取货位地址


                        // 创建请求对象


                        RequestTaskDto taskDto = new RequestTaskDto()


                        var taskDto = new RequestTaskDto()


                        {


                            Position = task.NextAddress,


                            PalletCode = task.PalletCode,


                        };




                        // 获取WMSip地址


                        var configz = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);


                        var wmsBasez = configz.Where(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE).FirstOrDefault()?.ConfigValue;


                        var requestLocation = configz.Where(x => x.ConfigKey == SysConfigKeyConst.RequestLocation).FirstOrDefault()?.ConfigValue;


                        if (wmsBasez == null || requestLocation == null)


                        {


                            throw new InvalidOperationException("WMS IP 未配置");


                        }


                        var wmsIpAddrss = wmsBasez + requestLocation;




                        // 发送请求并等待响应


                        var abc = HttpHelper.PostAsync("http://127.0.0.1:5000/api/Task/RequestLocationTaskAsync", taskDto.ToJsonString()).Result;


                        var abc = HttpHelper.PostAsync(wmsIpAddrss, taskDto.ToJsonString()).Result;


                        if (abc == null)


                            return content.Error();


                        // 反序列化响应内容


@@ -462,7 +448,7 @@


                            return content;




                        // 反序列化任务数据


                        WMSTaskDTO taskResult = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());


                        var taskResult = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());




                        task.CurrentAddress = task.NextAddress;


                        task.NextAddress = taskResult.TargetAddress;


@@ -476,7 +462,11 @@


                        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


@@ -496,12 +486,17 @@


                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? $"人工手动将任务状态从【{oldState}】跳转到【{task.TaskState}】" : $"系统自动流程，任务状态从【{oldState}】转到【{task.TaskState}】");




                #region  更新任务状态


                object request = new


                // 获取WMSip地址


                var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);


                var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;


                var updateTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.UpdateTask)?.ConfigValue;


                if (wmsBase == null || updateTask == null)


                {


                    TaskNum = task.TaskNum,


                    TaskState = task.TaskState


                };


                var result = HttpHelper.PostAsync("http://127.0.0.1:5000/api/Task/UpdateTaskStatus", request.ToJsonString()).Result;


                    throw new InvalidOperationException("WMS IP 未配置");


                }


                var wmsIpAddress = wmsBase + updateTask;




                var result = HttpHelper.PostAsync(wmsIpAddress, new { TaskNum = task.TaskNum, TaskState = task.TaskState }.ToJsonString()).Result;


                content = JsonConvert.DeserializeObject<WebResponseContent>(result);


                #endregion




@@ -524,13 +519,13 @@


        {


            try


            {


                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.CurrentAddress == currentAddress);


                var task = BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.CurrentAddress == currentAddress);


                if (task == null) throw new Exception($"未找到该任务信息,任务号:【{taskNum}】");




                string oldCurrentPos = task.CurrentAddress;


                string oldNextPos = task.NextAddress;




                List<Dt_Router> routers = _routerService.QueryNextRoutes(task.NextAddress, task.TargetAddress);


                var routers = _routerService.QueryNextRoutes(task.NextAddress, task.TargetAddress);


                if (!routers.Any()) throw new Exception($"未找到设备路由信息");




                task.CurrentAddress = task.NextAddress;


@@ -559,23 +554,73 @@


            WebResponseContent content = new WebResponseContent();


            try


            {


                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);


                var task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);


                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");




                #region WMS同步任务完成


                var keys = new Dictionary<string, object>()


                {


                    {"taskNum", taskNum}


                };


                // 获取WMSip地址


                var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);


                var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;


                var completeTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.CompleteTask)?.ConfigValue;


                if (wmsBase == null || completeTask == null)


                {


                    throw new InvalidOperationException("WMS IP 未配置");


                }


                var wmsIpAddress = wmsBase + completeTask;




                var result = HttpHelper.GetAsync(wmsIpAddress, keys).Result;


                content = JsonConvert.DeserializeObject<WebResponseContent>(result);


                if (!content.Data.IsNullOrEmpty())


                {


                    if (content.Data.ToString() == "NG")


                    {


                        task.Remark = "NG";


                        //BaseDal.UpdateData(task);


                        //_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机出库完成，MOM返回NG");


                    }


                }


                task.ExceptionMessage += "   " + content.Message;


                #endregion




                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($"未找到设备路由信息");


                    if (!task.Roadway.Contains("GW"))


                    {


                        var routers = _routerService.QueryNextRoutes(task.NextAddress, task.TargetAddress);


                        if (!routers.Any()) return WebResponseContent.Instance.Error($"未找到设备路由信息");




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


                    task.TaskState = nextStatus;


                    task.CurrentAddress = task.NextAddress;


                    task.NextAddress = routers.FirstOrDefault().ChildPosi;


                    task.ModifyDate = DateTime.Now;


                    task.Modifier = "System";


                    BaseDal.UpdateData(task);


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


                        task.TaskState = nextStatus;


                        task.CurrentAddress = task.NextAddress;


                        task.NextAddress = routers.FirstOrDefault().ChildPosi;


                        task.ModifyDate = DateTime.Now;


                        task.Modifier = "System";


                        BaseDal.UpdateData(task);




                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机出库完成");


                        _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机出库完成");


                    }


                    else


                    {


                        task.TaskState = (int)TaskOutStatusEnum.OutFinish;


                        //如高温出库后 NG 则将任务标记为NG 并在出库申请后将任务出至NG口


                        if (task.Remark == "NG")


                        {


                            BaseDal.UpdateData(task);


                        }


                        else


                        {


                            BaseDal.DeleteData(task);


                            ConsoleHelper.WriteWarningLine($"高温出库目的地址{task.TargetAddress}");


                        }


                        


                        var taskHty = task.Adapt<Dt_Task_Hty>();


                        _taskHtyRepository.AddData(taskHty);


                        _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机出库完成");


                    }






                    //暂不考虑多个出库口


@@ -587,10 +632,13 @@


                    task.TaskState = nextStatus;


                    task.ModifyDate = DateTime.Now;


                    task.Modifier = "System";


                    BaseDal.UpdateData(task);




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


                    task_Hty.TaskId = 0;




                    BaseDal.DeleteData(task);


                    _taskHtyRepository.AddData(task_Hty);


                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机入库完成");






                }


                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)


                {


@@ -605,21 +653,16 @@


                }






                #region WMS同步任务完成


                var keys = new Dictionary<string, object>()


                {


                    {"taskNum", taskNum}


                };


                var result = HttpHelper.GetAsync($"http://127.0.0.1:5000/api/Task/CompleteTaskAsync", keys).Result;


                content = JsonConvert.DeserializeObject<WebResponseContent>(result);


                #endregion


                #region  更新任务状态


                object request = new




                var updateTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.UpdateTask)?.ConfigValue;


                if (wmsBase == null || updateTask == null)


                {


                    TaskNum = task.TaskNum,


                    TaskState = task.TaskState


                };


                result = HttpHelper.PostAsync("http://127.0.0.1:5000/api/Task/UpdateTaskStatus", request.ToJsonString()).Result;


                    throw new InvalidOperationException("WMS IP 未配置");


                }


                wmsIpAddress = wmsBase + updateTask;




                result = HttpHelper.PostAsync(wmsIpAddress, new { TaskNum = task.TaskNum, TaskState = task.TaskState }.ToJsonString()).Result;


                content = JsonConvert.DeserializeObject<WebResponseContent>(result);


                #endregion


                //content = WebResponseContent.Instance.OK();


@@ -641,14 +684,14 @@


            WebResponseContent content = new WebResponseContent();


            try


            {


                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);


                var task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);


                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");


                if (task.TaskState != (int)TaskInStatusEnum.InPending && task.TaskState != (int)TaskOutStatusEnum.OutPending)


                {


                    return content = WebResponseContent.Instance.Error($"该任务状态不可恢复,任务号:【{taskNum}】,任务状态:【{task.TaskState}】");


                }




                Dt_TaskExecuteDetail taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.IsNormal, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });


                var taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.IsNormal, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });


                if (taskExecuteDetail != null)


                {


                    task.TaskState = taskExecuteDetail.TaskState;


@@ -663,7 +706,6 @@


                    {


                        task.TaskState = (int)TaskInStatusEnum.InNew;


                    }


                    //todo


                }




                task.ExceptionMessage = string.Empty;


@@ -688,14 +730,14 @@


        /// <returns>返回处理结果</returns>


        public WebResponseContent RollbackTaskStatusToLast(int taskNum)


        {


            WebResponseContent content = new();


            WebResponseContent content = new WebResponseContent();


            try


            {


                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);


                var task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);


                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");




                int oldState = task.TaskState;


                Dt_TaskExecuteDetail taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });


                var taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });


                if (taskExecuteDetail != null)


                {


                    task.TaskState = taskExecuteDetail.TaskState;


@@ -721,5 +763,10 @@


            }


            return content;


        }




        public Dt_Task QueryRelocationTask(string deviceNo)


        {


            return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskType == (int)TaskRelocationTypeEnum.Relocation && x.TaskState == (int)TaskStatus.Created);


        }


    }


}