ZhiHuiQiCe/LongDeLiLiKu.git

			@@ -20,9 +20,11 @@
			using WIDESEAWCS_Tasks.StackerCraneJob;
			using WIDESEAWCS_Tasks;
			using WIDESEAWCS_Core;
			using SqlSugar.Extensions;
			using WIDESEAWCS_Tasks.ConveyorLineJob;
			using WIDESEAWCS_QuartzJob.Repository;
			using WIDESEAWCS_Core.Helper;
			using HslCommunication.WebSocket;
			using WIDESEAWCS_DTO.Equipment;

			namespace WIDESEAWCS_Tasks
			{
			@@ -36,8 +38,9 @@
			private readonly IRouterService _routerService;
			private readonly IRouterRepository _routerRepository;
			private readonly IStationMangerRepository _stationMangerRepository;
			private WebSocketServer _webSocketServer;

			public StackerCraneJob_YLSC3(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, IStationMangerRepository stationMangerRepository, IRouterRepository routerRepository)
			public StackerCraneJob_YLSC3(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, IStationMangerRepository stationMangerRepository, IRouterRepository routerRepository,WebSocketServer webSocketServer)
			{
			_taskService = taskService;
			_taskExecuteDetailService = taskExecuteDetailService;
			@@ -45,6 +48,7 @@
			_routerService = routerService;
			_stationMangerRepository = stationMangerRepository;
			_routerRepository = routerRepository;
			_webSocketServer = webSocketServer;
			}

			public Task Execute(IJobExecutionContext context)
			@@ -77,6 +81,7 @@
			task.Dispatchertime = DateTime.Now;
			task.ExceptionMessage = "";
			_taskService.UpdateTask(task, TaskStatusEnum.SC_Executing);
			//_taskService.UpdateTaskStatusToNext(task);
			commonStackerCrane.Communicator.Write("DB1000.20.0", true);
			//å»¶æ¶1s
			Thread.Sleep(1000);
			@@ -85,6 +90,25 @@
			}
			}
			}

			#region è°ç¨äºä»¶æ»çº¿éç¥åç«¯

			EquipmentDTO equipmentDTO = new EquipmentDTO();
			object obj = new
			{
			commonStackerCrane.DeviceName,
			commonStackerCrane.DeviceCode,
			StackerCraneAutoStatus.Automatic,
			StackerCraneStatus.Normal,
			StackerCraneWorkStatus.Standby,
			TaskNum = commonStackerCrane.CurrentTaskNum,
			WorkType = commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType),
			StackerAlarm = commonStackerCrane.Communicator.Read<short>("DB1000.54.0"),
			};
			equipmentDTO.StackerDataJson = obj.Serialize();
			_webSocketServer.PublishAllClientPayload(equipmentDTO.Serialize());

			#endregion
			}
			}
			catch (Exception ex)
			@@ -137,8 +161,33 @@
			return WebResponseContent.Instance.Error($"æªæ¾å°è·¯ç±ä¿¡æ¯,{task.NextAddress}");
			}
			int oldStatus = task.TaskState;
			// å åæºå®æ
			_taskService.UpdateTask(task, TaskStatusEnum.Line_Execute, deviceCode: stationManger.StationDeviceCode, currentAddress: stationManger.StationCode, nextAddress: router.NextPosi);
			//åæä¸æ¥¼åºåºä¸åçº¿ä½é»è¾
			if (stationManger.StationDeviceCode == "CL1_YL")
			{
			// å åæºå®æ
			_taskService.UpdateTask(task, TaskStatusEnum.Line_Execute, deviceCode: stationManger.StationDeviceCode, currentAddress: stationManger.StationCode, nextAddress: router.NextPosi);
			}
			else//åæäºæ¥¼åºåºä¸åçº¿ä½é»è¾
			{
			IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == stationManger.StationDeviceCode);
			if (device != null)
			{
			CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
			conveyorLine.SetValue(ConveyorLineDBName.TaskNum, taskNum, stationManger.StationCode);
			conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, router.NextPosi, stationManger.StationCode);
			conveyorLine.SetValue(ConveyorLineDBName.Width, task.TaskLength, stationManger.StationCode);
			conveyorLine.SetValue(ConveyorLineDBName.Barcode, task.PalletCode, stationManger.StationCode);
			conveyorLine.SetValue(ConveyorLineDBName.ResponState, 86, stationManger.StationCode);
			_taskService.UpdateTaskStatusToNext(task);
			}
			else
			{
			WriteInfo(deviceCode, $"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³åéè¾éçº¿åºåºä¿¡å·");
			_taskService.UpdateTaskExceptionMessage(taskNum, $"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³åéè¾éçº¿åºåºä¿¡å·");
			return WebResponseContent.Instance.Error($"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³åéè¾éçº¿åºåºä¿¡å·");
			}
			}

			_taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"ç³»ç»èªå¨æµç¨,ä»»å¡ç¶æä»ã{oldStatus}ãè½¬å°ã{task.TaskState}ã");
			WriteInfo(deviceCode, $"å åæºåºåºä»»å¡å®æ,ä»»å¡å·:{taskNum}");
			}
			@@ -244,21 +293,43 @@
			Dt_StationManger? stationManger = _stationMangerRepository.QueryFirst(x => x.StationCode == task.NextAddress && x.StackerCraneCode == task.DeviceCode);
			if (stationManger != null)
			{
			IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == stationManger.StationDeviceCode);
			if (device != null)
			if (stationManger.StationDeviceCode == "CL1_YL")
			{
			OtherDevice client = (OtherDevice)device;
			if (client.GetValue<WR_CLineYLDB, short>(WR_CLineYLDB.WR_Request, stationManger.StationCode) != 99)//åºåºç«å°æªè¢«å ç¨
			IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == stationManger.StationDeviceCode);
			if (device != null)
			{
			task.NextAddress = stationManger.StackerCraneStationCode;
			_taskRepository.UpdateData(task);
			return task;
			OtherDevice client = (OtherDevice)device;
			if (client.GetValue<WR_CLineYLDB, short>(WR_CLineYLDB.WR_Request, stationManger.StationCode) != 99)//åºåºç«å°æªè¢«å ç¨
			{
			task.NextAddress = stationManger.StackerCraneStationCode;
			_taskRepository.UpdateData(task);
			return task;
			}
			}
			else
			{
			WriteInfo(task.DeviceCode, $"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³å¤æåºåºç«å°æ¯å¦è¢«å ç¨");
			_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³å¤æåºåºç«å°æ¯å¦è¢«å ç¨");
			}
			}
			else
			{
			WriteInfo(task.DeviceCode, $"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³å¤æåºåºç«å°æ¯å¦è¢«å ç¨");
			_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³å¤æåºåºç«å°æ¯å¦è¢«å ç¨");
			IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == stationManger.StationDeviceCode);
			if (device != null)
			{
			CommonConveyorLine client = (CommonConveyorLine)device;
			if (client.GetValue<ConveyorLineDBName, short>(ConveyorLineDBName.InteractiveSignal, stationManger.StationCode) != 99)//åºåºç«å°æªè¢«å ç¨
			{
			task.NextAddress = stationManger.StackerCraneStationCode;
			_taskRepository.UpdateData(task);
			return task;
			}
			}
			else
			{
			WriteInfo(task.DeviceCode, $"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³å¤æåºåºç«å°æ¯å¦è¢«å ç¨");
			_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³å¤æåºåºç«å°æ¯å¦è¢«å ç¨");
			}
			}
			}
			else