MeiRuiAn/HuaiAn.git

			@@ -74,6 +74,7 @@
			{
			try
			{
			Thread.Sleep(2200);
			CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
			if (commonStackerCrane != null)
			{
			@@ -275,7 +276,6 @@
			WriteError(commonStackerCrane.DeviceCode, $"ç§»åºæ¥å£è°ç¨éè¯¯");
			_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"ç§»åºæ¥å£è°ç¨éè¯¯");
			return null;

			}
			if (task.TaskNum == taskDTO.TaskNum)
			{
			@@ -286,10 +286,19 @@
			Dt_Task reloTask = _mapper.Map<Dt_Task>(taskDTO);
			//å¤æç§»åºè´§ä½ä»»å¡æ¯å¦å·²åå¨ï¼å¦åå¨åæ§è¡
			Dt_Task existTask = _taskService.QueryStackerExistTask(reloTask.PalletCode, reloTask.SourceAddress);
			if (existTask != null)
			if (existTask != null && existTask.TaskState == (int)TaskStatusEnum.SC_Execute)
			{
			Dt_StationManger? stationManger = _stationMangerRepository.QueryFirst(x => (x.StationCode == task.NextAddress \|\| x.StackerCraneStationCode == task.NextAddress) && x.StackerCraneCode == task.DeviceCode);
			existTask.NextAddress = stationManger.StackerCraneStationCode;
			_taskRepository.UpdateData(existTask);
			return existTask;
			}
			else if (existTask != null && existTask.TaskState != (int)TaskStatusEnum.SC_Execute)
			{
			WriteError(commonStackerCrane.DeviceCode, $"ä»»å¡{task.TaskNum}æµè´§ä½ä»»å¡{existTask.TaskNum}ä»»å¡ç¶æä¸ä¸ºå åå¾æ§è¡");
			_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"ä»»å¡{task.TaskNum}æµè´§ä½ä»»å¡{existTask.TaskNum}ä»»å¡ç¶æä¸ä¸ºå åå¾æ§è¡");
			return null;
			}
			else
			{
			reloTask.TaskState = TaskStatusEnum.SC_Execute.ObjToInt();