RuiShengZhiNeng/GaoPuLiTiKu.git

			@@ -26,8 +26,10 @@
			using WIDESEAWCS_Core;
			using WIDESEAWCS_Core.BaseRepository;
			using WIDESEAWCS_Core.BaseServices;
			using WIDESEAWCS_Core.Enums;
			using WIDESEAWCS_Core.Helper;
			using WIDESEAWCS_DTO;
			using WIDESEAWCS_DTO.RGV.FOURBOT;
			using WIDESEAWCS_DTO.TaskInfo;
			using WIDESEAWCS_DTO.WMS;
			using WIDESEAWCS_IBasicInfoService;
			@@ -47,6 +49,7 @@
			private readonly IRGVLocationInfoService _rGVLocationInfoService;
			private readonly IRepository<Dt_TaskExecuteDetail> _taskExecuteDetailRepository;
			private readonly IApiInfoService _apiInfoService;
			private readonly IStationMangerService _stationMangerService;
			private readonly IMapper _mapper;

			private Dictionary<string, OrderByType> _taskOrderBy = new()
			@@ -144,7 +147,7 @@
			{
			Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode);
			if (dt_Task == null) throw new Exception("æªæ¥è¯¢å°ä»»å¡å·ç¸å³ä»»å¡");


			// å¤æå½åä»»å¡æ¯å¦ä¸ºå¯ä¹å£«ä»»å¡
			bool isGALAXISTask = dt_Task.TaskType == (int)TaskTypeEnum.MLInbound \|\|
			dt_Task.TaskType == (int)TaskTypeEnum.MLOutbound;
			@@ -153,13 +156,14 @@
			//æµ·åº·
			bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry \|\| dt_Task.TaskType == (int)TaskTypeEnum.CJInbound \|\| dt_Task.TaskType == (int)TaskTypeEnum.CJInbound \|\| dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
			//è¿éå°ç¶ææ¹åäº198åæ¶ä»»å¡
			dt_Task.TaskType = TaskOutStatusEnum.OutCancel.ObjToInt();
			dt_Task.TaskType = TaskStatusEnum.WMSCancel.ObjToInt();
			#region
			if (isGALAXISTask)
			{
			var KLS = new CancelGALAXISTask
			{
			taskId= dt_Task.WMSTaskNum,
			reportTime=DateTime.Now.ToString()
			var KLS = new CancelGALAXISTask
			{
			taskId = dt_Task.WMSTaskNum,
			reportTime = DateTime.Now.ToString()
			};
			Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelGALAXISTask));
			if (apiInfo == null) throw new Exception("æªæ¾å°å¯ä¹å£«AGVä»»å¡ä¸åæ¥å£éç½®ä¿¡æ¯ï¼è¯·æ£æ¥æ¥å£éç½®");
			@@ -167,11 +171,41 @@
			GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
			if (agvContent.success == true && agvContent.code == 0)
			{
			BaseDal.UpdateData(dt_Task);
			return content.OK("åæ¶ä»»å¡æå", dt_Task);
			//ç´æ¥ç§»å¥åå²
			BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.èªå¨å®æ);
			return content.OK("åæ¶ä»»å¡æå", dt_Task);
			}
			else
			{
			return content.Error($"ä»»å¡å¤±è´¥{agvContent.data.returnInfo}");

			}
			}
			content.Error("åæ¶ä»»å¡å¤±è´¥");
			#endregion

			#region ååè½¦
			if (isAGV)
			{
			CancelSXCTake cancelSXCTake = new CancelSXCTake
			{
			taskID = dt_Task.RGVTaskId
			};
			Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelSXCTake));
			if (apiInfo == null) throw new Exception("æªæ¾å°å¯ä¹å£«AGVä»»å¡ä¸åæ¥å£éç½®ä¿¡æ¯ï¼è¯·æ£æ¥æ¥å£éç½®");
			string response = HttpHelper.Post(apiInfo.ApiAddress, cancelSXCTake.Serialize());
			FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
			if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "æå")
			{
			//ç´æ¥ç§»å¥åå²
			BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.èªå¨å®æ);
			return content.OK("åæ¶ä»»å¡æå", dt_Task);
			}
			else
			{
			return content.Error($"ä»»å¡å¤±è´¥{fOURBOTReturn.data}");
			}
			}
			#endregion
			}
			catch (Exception ex)
			{
			@@ -210,7 +244,7 @@
			{
			var updateGALAXISTaskGrade = new UpdateGALAXISTaskGrade
			{
			taskId = dt_Task.TaskNum.ToString(),
			taskId = dt_Task.WMSTaskNum,
			reportTime = DateTime.Now.ToString(),
			district = dt_Task.Roadway,//ä»»å¡åºåº
			priorityCode = updateTaskPriority.taskPriority,
			@@ -221,12 +255,39 @@
			GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
			if (agvContent.success == true && agvContent.code == 0)
			{
			BaseDal.UpdateData(dt_Task);
			return content.OK("ä¿®æ¹ä»»å¡ä¼åçº§æå", dt_Task);

			return content.OK("ä¿®æ¹ä»»å¡ä¼åçº§æå", dt_Task);
			}
			else {
			return content.Error($"ä»»å¡å¤±è´¥{agvContent.data.returnInfo}");
			}
			}
			#endregion
			content.Error("ä¿®æ¹ä»»å¡ä¼åçº§å¤±è´¥");

			#region ååè½¦
			if (isAGV)
			{
			var request = new UpdateAgvSXCTake
			{
			taskID = dt_Task.RGVTaskId,
			priority = updateTaskPriority.taskPriority
			};
			Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(UpdateAgvSXCTake));
			if (apiInfo == null) throw new Exception("æªæ¾å°å¯ä¹å£«AGVä»»å¡ä¸åæ¥å£éç½®ä¿¡æ¯ï¼è¯·æ£æ¥æ¥å£éç½®");
			string response = HttpHelper.Post(apiInfo.ApiAddress, request.Serialize());
			FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
			if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn .returnUserMsg== "æå")
			{

			return content.OK("ä¿®æ¹ä»»å¡ä¼åçº§æå", dt_Task);
			}
			else
			{
			return content.Error($"ä»»å¡å¤±è´¥{fOURBOTReturn.data}");
			}
			}
			#endregion

			}
			catch (Exception ex)
			{