MeiRuiAn/HuaiAn.git

			@@ -26,6 +26,9 @@
			using WIDESEAWCS_Core.Caches;
			using Newtonsoft.Json;
			using WIDESEAWCS_TaskInfoService;
			using WIDESEAWCS_Tasks.ConveyorLineJob;
			using WIDESEAWCS_QuartzJob.Repository;
			using Autofac.Core;

			namespace WIDESEAWCS_Tasks
			{
			@@ -38,9 +41,11 @@
			private readonly ITaskRepository _taskRepository;
			private readonly IRouterService _routerService;
			private readonly IStationMangerRepository _stationMangerRepository;
			private readonly IRouterRepository _routerRepository;
			private List<Dt_ApiInfo> apiInfos;
			private readonly List<Dt_WarehouseDevice> warehouseDevices;

			public StackerCraneJob_BC(ITaskService taskService, ICacheService cacheService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, IStationMangerRepository stationMangerRepository)
			public StackerCraneJob_BC(ITaskService taskService, ICacheService cacheService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, IStationMangerRepository stationMangerRepository, IRouterRepository routerRepository)
			{
			_taskService = taskService;
			_taskExecuteDetailService = taskExecuteDetailService;
			@@ -48,6 +53,7 @@
			_routerService = routerService;
			_stationMangerRepository = stationMangerRepository;
			_cacheService = cacheService;
			_routerRepository = routerRepository;

			string? apiInfoStr = _cacheService.Get("apiInfos");
			if (!string.IsNullOrEmpty(apiInfoStr))
			@@ -62,6 +68,17 @@
			apiInfos = infos;
			}
			}


			string? warehouseDevicesStr = _cacheService.Get<string>(nameof(Dt_WarehouseDevice));
			if (!string.IsNullOrEmpty(warehouseDevicesStr))
			{
			warehouseDevices = JsonConvert.DeserializeObject<List<Dt_WarehouseDevice>>(warehouseDevicesStr) ?? new List<Dt_WarehouseDevice>();
			}
			else
			{
			warehouseDevices = new List<Dt_WarehouseDevice>();
			}
			}

			public Task Execute(IJobExecutionContext context)
			@@ -71,6 +88,13 @@
			CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
			if (commonStackerCrane != null)
			{
			Dt_WarehouseDevice? warehouseDevice = warehouseDevices.FirstOrDefault(x => x.DeviceCode == commonStackerCrane.DeviceCode);
			if (warehouseDevice == null)
			{
			WriteError(commonStackerCrane.DeviceName, $"è¯·éç½®ä»åºè®¾å¤ä¿¡æ¯");
			return Task.CompletedTask;
			}

			if (!commonStackerCrane.IsEventSubscribed)
			{
			commonStackerCrane.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;//è®¢éä»»å¡å®æäºä»¶
			@@ -138,7 +162,15 @@
			_taskService.UpdateTaskExceptionMessage(taskNum, $"è¾éçº¿åºåºç«ç¹æªéç½®,{task.NextAddress}");
			return WebResponseContent.Instance.Error($"è¾éçº¿åºåºç«ç¹æªéç½®,{task.NextAddress}");
			}
			_taskService.UpdateTask(task, TaskStatusEnum.Line_Execute, deviceCode: stationManger.StationDeviceCode, currentAddress: stationManger.StationCode, nextAddress: task.TargetAddress);
			Dt_Router router = _routerRepository.QueryFirst(x => x.InOutType == task.TaskType && x.StartPosi == stationManger.StationCode);
			if (router == null)
			{
			_taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"æªæ¾å°è·¯ç±ä¿¡æ¯,{task.NextAddress}");
			_taskService.UpdateTaskExceptionMessage(taskNum, $"æªæ¾å°è·¯ç±ä¿¡æ¯,{task.NextAddress}");
			return WebResponseContent.Instance.Error($"æªæ¾å°è·¯ç±ä¿¡æ¯,{task.NextAddress}");
			}

			_taskService.UpdateTask(task, TaskStatusEnum.Line_Execute, deviceCode: stationManger.StationDeviceCode, currentAddress: stationManger.StationCode, nextAddress: router.NextPosi, targetAddress: router.NextPosi);
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup \|\| task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
			{
			@@ -222,15 +254,15 @@

			if (task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			{
			string? url = apiInfos.FirstOrDefault(x => x.ApiCode == APIEnum.FeedBackWMSTaskCompleted.ToString())?.ApiAddress;
			if (string.IsNullOrEmpty(url))
			{
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskNum, $"æªæ¾å°WMSç§»åºå¤ææ¥å£");
			WriteError(commonStackerCrane.DeviceCode, $"æªæ¾å°WMSç§»åºå¤ææ¥å£");
			_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"æªæ¾å°WMSç§»åºå¤ææ¥å£");
			return null;
			}
			HttpHelper.Post($"{url}?taskNum={task.TaskNum}&locationCode={task.NextAddress}", "");//todo è°ç¨WMSä»»å¡å®ææ¹æ³
			//string? url = apiInfos.FirstOrDefault(x => x.ApiCode == APIEnum.WMSIsReloaction.ToString())?.ApiAddress;
			//if (string.IsNullOrEmpty(url))
			//{
			// _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskNum, $"æªæ¾å°WMSç§»åºå¤ææ¥å£");
			// WriteError(commonStackerCrane.DeviceCode, $"æªæ¾å°WMSç§»åºå¤ææ¥å£");
			// _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"æªæ¾å°WMSç§»åºå¤ææ¥å£");
			// return null;
			//}
			//HttpHelper.Post($"{url}?taskNum={task.TaskNum}&locationCode={task.NextAddress}", "");//todo è°ç¨WMSä»»å¡å®ææ¹æ³
			}

			return task;
			@@ -250,11 +282,10 @@
			if (device != null)
			{
			OtherDevice client = (OtherDevice)device;
			if (client.GetValue<GroundStationDBName, bool>(GroundStationDBName.R_IsCanPut, stationManger.StationCode))//åºåºç«å°æªè¢«å ç¨
			if (!client.GetValue<R_ConveyorLineDB, bool>(R_ConveyorLineDB.Goods, stationManger.StationCode))//åºåºç«å°æªè¢«å ç¨
			{
			task.NextAddress = stationManger.StackerCraneStationCode;
			_taskRepository.UpdateData(task);
			client.SetValue(GroundStationDBName.R_IsCanPut, true, stationManger.StationCode);
			return task;
			}
			}