百步立体仓库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
刘磊
2025-01-08 1d044540ee1b7041c7e89bdfe6d1339c99e80a4e 
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs


@@ -41,6 +41,7 @@


using WIDESEAWCS_Model.Models;


using WIDESEAWCS_QuartzJob;


using WIDESEAWCS_QuartzJob.DTO;


using WIDESEAWCS_QuartzJob.Repository;


using WIDESEAWCS_QuartzJob.Service;


using WIDESEAWCS_SignalR;


using WIDESEAWCS_Tasks.ConveyorLineJob;


@@ -63,8 +64,9 @@


        private readonly ICacheService _cacheService;


        private readonly INoticeService _noticeService;


        private readonly IDt_needBarcodeRepository _needBarcodeRepository;


        private readonly IDeviceInfoRepository _deviceInfoRepository;




        public CommonConveyorLine_GWJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, IPlatFormRepository platFormRepository, ISys_ConfigService sys_ConfigService, IDt_StationManagerRepository stationManagerRepository, ICacheService cacheService, INoticeService noticeService, IDt_needBarcodeRepository needBarcodeRepository)


        public CommonConveyorLine_GWJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, IPlatFormRepository platFormRepository, ISys_ConfigService sys_ConfigService, IDt_StationManagerRepository stationManagerRepository, ICacheService cacheService, INoticeService noticeService, IDt_needBarcodeRepository needBarcodeRepository, IDeviceInfoRepository deviceInfoRepository)


        {


            _taskService = taskService;


            _taskExecuteDetailService = taskExecuteDetailService;


@@ -77,6 +79,7 @@


            _cacheService = cacheService;


            _noticeService = noticeService;


            _needBarcodeRepository = needBarcodeRepository;


            _deviceInfoRepository = deviceInfoRepository;


        }




        public Task Execute(IJobExecutionContext context)


@@ -137,7 +140,8 @@


                                    MethodInfo? method = GetType().GetMethod(platform.ExecutionMethod);


                                    if (method != null)


                                    {


                                        int count = string.IsNullOrEmpty(platform.Location) ? 0 + 1 : platform.Location.Split(',').Count() + 1;


                                        //var strings = platform.Location.Split(',').ToList();


                                        int count = 1;


                                        method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, count, platform });


                                    }


                                }


@@ -160,7 +164,7 @@


                            childDeviceCode,


                            commandAfter = command,


                        };


                        _noticeService.StackerData(userIds?.FirstOrDefault(), userTokenIds, new { conveyorLine.DeviceName, data = obj });


                        _noticeService.LineData(userIds?.FirstOrDefault(), userTokenIds, new { conveyorLine.DeviceName, data = obj });




                        #endregion 调用事件总线通知前端


                    }


@@ -449,7 +453,7 @@


                    taskOutboundTypeEnum = TaskOutboundTypeEnum.OutTray;


                else


                    taskOutboundTypeEnum = TaskOutboundTypeEnum.Outbound;


                await CheckAndCreateTask(taskOutboundTypeEnum, childDeviceCode, index, platform.Stacker, platform);


                await CheckAndCreateTask(taskOutboundTypeEnum, childDeviceCode, index, platform);


            }


            catch (Exception)


            {


@@ -459,7 +463,7 @@


        /// <summary>


        /// 检查任务并创建新任务


        /// </summary>


        private async Task CheckAndCreateTask(TaskOutboundTypeEnum taskType, string childDeviceCode, int index, string roadWay, Platform platform)


        private async Task CheckAndCreateTask(TaskOutboundTypeEnum taskType, string childDeviceCode, int index, Platform platform)


        {


            var tasks = _taskRepository.QueryData(x => x.TaskType == (int)taskType && x.TargetAddress == childDeviceCode);


            if (tasks.Count < index)


@@ -478,10 +482,11 @@


                }


                var wmsIpAddress = wmsBase + requestTrayOutTask;






                var device = _deviceInfoRepository.QueryData(x => x.DeviceStatus == "1" && x.DeviceRemark == platform.Id.ToString());


                var deviceCode = device.Select(x => x.DeviceCode).ToList();


                List<string> strings = platform.Location.Split(',').ToList();




                var result = await HttpHelper.PostAsync(wmsIpAddress, new { Position = childDeviceCode, Tag = (int)taskType, AreaCdoe = roadWay, AreaCdoes = strings, platform.ProductionLine }.ToJsonString());


                var result = await HttpHelper.PostAsync(wmsIpAddress, new { Position = childDeviceCode, Tag = (int)taskType, AreaCdoe = platform.Stacker, AreaCdoes = strings, platform.ProductionLine }.ToJsonString());


                //var result = await HttpHelper.PostAsync("http://localhost:5000/api/Task/RequestTrayOutTaskAsync", dynamic.ToJsonString());




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