百步立体仓库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
刘磊
2024-11-20 f6a30a6e9d6f200f1a39d0dee3194b7ea5961e7b 
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs


@@ -27,6 +27,8 @@


using System.Diagnostics.CodeAnalysis;


using System.Reflection;


using System.Threading.Tasks;


using WIDESEAWCS_BasicInfoRepository;


using WIDESEAWCS_BasicInfoService;


using WIDESEAWCS_Common.TaskEnum;


using WIDESEAWCS_Core;


using WIDESEAWCS_Core.Helper;


@@ -50,14 +52,16 @@


        private readonly ITaskExecuteDetailService _taskExecuteDetailService;


        private readonly IRouterService _routerService;


        private readonly IMapper _mapper;


        private readonly IDt_StationManagerService _stationManagerService;




        public CommonConveyorLine_AfterJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository)


        public CommonConveyorLine_AfterJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository,IDt_StationManagerService stationManagerService)


        {


            _taskService = taskService;


            _taskExecuteDetailService = taskExecuteDetailService;


            _routerService = routerService;


            _mapper = mapper;


            _taskRepository = taskRepository;


            _stationManagerService = stationManagerService;


        }




        public Task Execute(IJobExecutionContext context)


@@ -67,6 +71,7 @@


                CommonConveyorLine_After conveyorLine = (CommonConveyorLine_After)context.JobDetail.JobDataMap.Get("JobParams");


                if (conveyorLine != null)


                {


                    List<Dt_StationManager> stationManagers = _stationManagerService.GetAllStationByDeviceCode(conveyorLine.DeviceCode);


                    List<string> childDeviceCodes = _routerService.QueryAllPositions(conveyorLine.DeviceCode);


                    //List<Task> tasks = new List<Task>();


                    foreach (string childDeviceCode in childDeviceCodes)


@@ -106,14 +111,13 @@


        /// <param name="conveyorLine">输送线实例对象</param>


        /// <param name="command">读取的请求信息</param>


        /// <param name="childDeviceCode">子设备编号</param>


        /// <param name="ProtocalDetailValue">线体当前bool读取偏移地址</param>


        public void RequestInbound(CommonConveyorLine_After conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode)


        {


            var taskNew = _taskService.QueryCraneConveyorLineTask(command.ConveyorLineTaskNum.ObjToInt(), childDeviceCode);


            if (taskNew == null)


            {


                string barcode = command.ConveyorLineBarcode.TrimEnd();


                if (_taskService.RequestWMSTask(command.ConveyorLineBarcode, childDeviceCode).Status)


                if (_taskService.RequestWMSTask(command.ConveyorLineBarcode, childDeviceCode).Result.Status)


                {


                    Dt_Task task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);


                    if (task != null)