MeiRuiAn/HuaiAn.git

			@@ -17,6 +17,7 @@
			using WIDESEAWCS_QuartzJob.DTO;
			using WIDESEAWCS_QuartzJob.Models;
			using WIDESEAWCS_QuartzJob.Repository;
			using WIDESEAWCS_QuartzJob.Service;
			using WIDESEAWCS_Tasks.ConveyorLineJob;

			namespace WIDESEAWCS_Tasks
			@@ -30,14 +31,18 @@
			private readonly ITaskRepository _taskRepository;
			private readonly IStationMangerRepository _stationMangerRepository;
			private readonly IRouterRepository _routerRepository;
			private readonly IRouterService _routerService;
			private readonly IRouterExtension _routerExtension;

			public ConveyorLineJob_BC(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IStationMangerRepository stationMangerRepository, IRouterRepository routerRepository)
			public ConveyorLineJob_BC(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IStationMangerRepository stationMangerRepository, IRouterRepository routerRepository, IRouterService routerService, IRouterExtension routerExtension)
			{
			_taskService = taskService;
			_taskExecuteDetailService = taskExecuteDetailService;
			_taskRepository = taskRepository;
			_stationMangerRepository = stationMangerRepository;
			_routerRepository = routerRepository;
			_routerService = routerService;
			_routerExtension = routerExtension;
			}

			public Task Execute(IJobExecutionContext context)
			@@ -76,10 +81,18 @@
			{
			if (conveyorLineInfoRead.TaskNum == 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.Barcode))//éè´å¥åº
			{
			WebResponseContent content = _taskService.RequestWMSTask(conveyorLineInfoRead.Barcode, item.StationCode);
			if (content.Status)
			List<Dt_Router> routers = _routerExtension.GetEndPoint(item.StationCode, TaskTypeEnum.Inbound.ObjToInt());

			List<string> stations = routers.Select(x => x.NextPosi).ToList();

			WebResponseContent responseContent = _taskService.RequestWMSAssignRoadway(stations);
			if (responseContent.Status)
			{
			device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);
			WebResponseContent content = _taskService.RequestWMSTask(conveyorLineInfoRead.Barcode, item.StationCode);
			if (content.Status)
			{
			device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);
			}
			}
			}
			else//çäº§éåº