百步立体仓库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
Administrator
2024-12-02 58a8a8843f101b2a1ba25622e2ef8ade605e0c49 
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs


@@ -5,6 +5,8 @@


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;


@@ -17,6 +19,7 @@


using WIDESEAWCS_ITaskInfoService;


using WIDESEAWCS_Model.Models;


using WIDESEAWCS_QuartzJob.Models;


using WIDESEAWCS_QuartzJob.Repository;


using WIDESEAWCS_QuartzJob.Service;




namespace WIDESEAWCS_TaskInfoService


@@ -28,6 +31,9 @@


        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 Dictionary<string, OrderByType> _taskOrderBy = new()


        {


@@ -42,13 +48,16 @@




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




        public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ISys_ConfigService sys_ConfigService) : 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) : base(BaseDal)


        {


            _routerService = routerService;


            _taskExecuteDetailService = taskExecuteDetailService;


            _taskExecuteDetailRepository = taskExecuteDetailRepository;


            _mapper = mapper;


            _sys_ConfigService = sys_ConfigService;


            _stationManagerService = stationManagerService;


            _stationManagerRepository = stationManagerRepository;


            _routerRepository = routerRepository;


        }




        /// <summary>


@@ -78,6 +87,16 @@


                            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)


@@ -119,7 +138,7 @@


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


                if (hasTask != null)


                {


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


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


                }




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


@@ -524,18 +543,28 @@




                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup && task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)


                {


                    var 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;


                        BaseDal.UpdateData(task);




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


                    }






                    //暂不考虑多个出库口


@@ -547,7 +576,7 @@


                    task.TaskState = nextStatus;


                    task.ModifyDate = DateTime.Now;


                    task.Modifier = "System";


                    BaseDal.UpdateData(task);


                    BaseDal.DeleteData(task);


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


                }


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


@@ -565,9 +594,9 @@




                #region WMS同步任务完成


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


            {


                {"taskNum", taskNum}


            };


                {


                    {"taskNum", taskNum}


                };


                // 获取WMSip地址


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


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


@@ -580,12 +609,21 @@




                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");


                    }


                }


                #endregion






                #region  更新任务状态




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


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


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


                {


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