百步立体仓库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
1
刘磊
2024-12-26 e5642daf4b6820d0706967e486b16e8d33a46d6d 
 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;


@@ -62,8 +63,9 @@


        private readonly IDt_StationManagerRepository _stationManagerRepository;


        private readonly ICacheService _cacheService;


        private readonly INoticeService _noticeService;


        private readonly 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)


        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)


        {


            _taskService = taskService;


            _taskExecuteDetailService = taskExecuteDetailService;


@@ -75,6 +77,7 @@


            _stationManagerRepository = stationManagerRepository;


            _cacheService = cacheService;


            _noticeService = noticeService;


            _needBarcodeRepository = needBarcodeRepository;


        }




        public Task Execute(IJobExecutionContext context)


@@ -366,15 +369,28 @@


                WebResponseContent content = new WebResponseContent();


                ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);


                taskCommand.InteractiveSignal = command.InteractiveSignal;


                Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationPLC == conveyorLine.DeviceCode && x.stationChildCode == childDeviceCode);


                if (task.PalletCode != command.ConveyorLineBarcode)


                {


                    var NGAddress = _platFormRepository.QueryFirst(x => x.PlatCode == task.TargetAddress).Capacity;


                    taskCommand.ConveyorLineTargetAddress = (short)NGAddress;


                    //var NGAddress = _platFormRepository.QueryFirst(x => x.PlatCode == task.TargetAddress).Capacity;


                    //taskCommand.ConveyorLineTargetAddress = (short)NGAddress;


                    taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(stationManager.stationNGChildCode);


                }


                else


                {


                    Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationPLC == conveyorLine.DeviceCode && x.stationChildCode == childDeviceCode);


                    //Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationPLC == conveyorLine.DeviceCode && x.stationChildCode == childDeviceCode);


                    taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(stationManager.stationLocation);


                }




                if (stationManager.stationPLC == "1018" && stationManager.stationArea == "Cache")  //更新在途数据


                {


                    dt_needBarcode needBarcode = _needBarcodeRepository.QueryFirst(x => x.productLine == stationManager.productLine && x.toArea == stationManager.stationChildCode);




                    if (needBarcode != null)


                    {


                        needBarcode.inLineNum--;


                        _needBarcodeRepository.UpdateData(needBarcode);


                    }


                }




                conveyorLine.SendCommand(taskCommand, childDeviceCode);


@@ -434,7 +450,7 @@


                    taskOutboundTypeEnum = TaskOutboundTypeEnum.OutTray;


                else


                    taskOutboundTypeEnum = TaskOutboundTypeEnum.Outbound;


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


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


            }


            catch (Exception)


            {


@@ -444,7 +460,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)


@@ -463,10 +479,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);