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


@@ -63,9 +63,10 @@


        private readonly IDt_StationManagerRepository _stationManagerRepository;


        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, 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, IDeviceInfoRepository deviceInfoRepository)


        {


            _taskService = taskService;


            _taskExecuteDetailService = taskExecuteDetailService;


@@ -77,6 +78,7 @@


            _stationManagerRepository = stationManagerRepository;


            _cacheService = cacheService;


            _noticeService = noticeService;


            _needBarcodeRepository = needBarcodeRepository;


            _deviceInfoRepository = deviceInfoRepository;


        }




@@ -138,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 });


                                    }


                                }


@@ -161,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 调用事件总线通知前端


                    }


@@ -369,17 +372,30 @@


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


                conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, childDeviceCode);


                //ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);