KuKa/BeiJingBeiQiAGV.git

			@@ -15,6 +15,7 @@
			using WIDESEAWCS_BasicInfoService;
			using WIDESEAWCS_Common;
			using WIDESEAWCS_Common.APIEnum;
			using WIDESEAWCS_Common.StationEnum;
			using WIDESEAWCS_Common.TaskEnum;
			using WIDESEAWCS_Core;
			using WIDESEAWCS_Core.BaseRepository;
			@@ -428,7 +429,7 @@
			catch { }
			stringBuilder.Append($",ä»»å¡ç¶æç±{oldStatus}åæ´ä¸º{newStatus}");

			task.TaskState = taskStatus.ObjToInt();
			task.TaskState = (int)taskStatus;
			}
			BaseDal.UpdateData(task);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, stringBuilder.ToString());
			@@ -454,13 +455,25 @@
			WriteLog.Write_Log("ä»»å¡å®æ", "ä»»å¡å®ææ¥å£", "ä»»å¡å·", $"ä»»å¡ï¼{taskNum}");

			// åæ¬¡æ¥è¯¢ä»»å¡ç¶æï¼é²æ¢å¨éçå¾æé´ä»»å¡ç¶æå·²æ¹å
			Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
			Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == taskNum);
			if (task == null)
			{
			return content.Error($"ä»»å¡{taskNum}ä¸åå¨");
			}
			//ä»»å¡å®æé»è¾
			_unitOfWorkManage.BeginTran();
			// æå½åä»»å¡æ¥åºæ¥ ç¶åæ¯ä¸ä¸ªåæ®µèµå¼ç»åå²ä»»å¡ ç¶åå é¤å½åä»»å¡ æ·»å ä¸æ¡åå²ä»»å¡ // ç¶åæè¿ä¸ªä»»å¡çç»ç¹çå¯¹åºç«å°çç¶æè®¾ç½®ä¸ºå¯ç¨
			Dt_Task_Hty dt_Task_Hty = _mapper.Map<Dt_Task_Hty>(task);
			dt_Task_Hty.TaskNum = task.TaskId;

			Dt_StationManager dt_StationManager = _stationManagerRepository.QueryFirst(x => x.StationLocation == task.TargetAddress);
			if(dt_StationManager == null) return content.Error($"ä»»å¡{taskNum}çå½åç«å°ä¸åå¨");

			dt_StationManager.StationStatus = ((int)StationEnum.Enable).ToString();

			_taskHtyRepository.AddData(dt_Task_Hty);
			BaseDal.DeleteData(task);
			_stationManagerRepository.UpdateData(dt_StationManager);

			_unitOfWorkManage.CommitTran();
			content.OK("ä»»å¡å®æ");