1

dengjunjie

2025-03-18 9f225bb1f1e26d25c1652d3e1ec2a8f239f69615

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs

@@ -35,6 +35,7 @@
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.ConveyorLine.Enum;
using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_QuartzJob.Repository;
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_Tasks.ConveyorLineJob;

@@ -46,13 +47,15 @@
        private readonly ITaskService _taskService;
        private readonly ITaskExecuteDetailService _taskExecuteDetailService;
        private readonly IRouterService _routerService;
        private readonly IRouterRepository _routerRepository;
        private readonly IMapper _mapper;

        public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper)
        public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IRouterRepository routerRepository, IMapper mapper)
        {
            _taskService = taskService;
            _taskExecuteDetailService = taskExecuteDetailService;
            _routerService = routerService;
            _routerRepository = routerRepository;
            _mapper = mapper;
        }

@@ -63,20 +66,7 @@
                CommonConveyorLine conveyorLine = (CommonConveyorLine)context.JobDetail.JobDataMap.Get("JobParams");
                if (conveyorLine != null)
                {
                    List<Task> tasks = null;// new List<Task>();
                    switch (conveyorLine.DeviceName)
                    {
                        case "输送线":
                            tasks = ConveyorLineExtend(conveyorLine);
                            //Console.Out.WriteLine(conveyorLine.DeviceName + DateTime.Now);
                            break;
                        case "产线":
                            tasks = ProductionLineExtend(conveyorLine);
                            //Console.Out.WriteLine(conveyorLine.DeviceName + DateTime.Now);
                            break;
                    }
                    if (tasks == null) throw new Exception($"{conveyorLine.DeviceName}bug");
                    Task.WaitAll(tasks.ToArray());
                    ConveyorLineExtend(conveyorLine);
                }
            }
            catch (Exception ex)