RuiShengZhiNeng/GaoPuLiTiKu.git

			@@ -32,10 +32,8 @@
			try
			{
			Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(FOURBOTnewMovePodTask)) ?? throw new Exception("æªæ¾å°ååè½¦ä»»å¡ä¸åæ¥å£éç½®ä¿¡æ¯ï¼è¯·æ£æ¥æ¥å£éç½®");
			int i = 0;
			foreach (var task in tasks)
			{
			i++;
			fOURBOTnewMovePodTask = new()
			{
			priority = task.Grade,
			@@ -47,7 +45,7 @@
			desStationCodes = task.SourceAddress,
			desType = 5
			};
			fOURBOTnewMovePodTask.requestID += i;
			fOURBOTnewMovePodTask.requestID += task.TaskId;
			try
			{
			string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
			@@ -65,10 +63,16 @@
			task.RGVTaskId = fOURBO.taskID;
			task.ExceptionMessage = "";
			task.TaskState = (int)TaskStatusEnum.Execut;
			task.Dispatchertime = DateTime.Now;
			}
			catch (Exception ex)
			{
			task.ExceptionMessage = ex.Message;
			content.Error(ex.Message);
			}
			finally
			{
			_trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "ä¸åååè½¦æ°å»ºå¥åºä»»å¡", "", "");
			}
			}
			var uptasks = tasks.Where(task => string.IsNullOrEmpty(task.ExceptionMessage)).ToList();
			@@ -78,6 +82,7 @@
			{
			foreach (var item in errortasks)
			{
			Thread.Sleep(500);
			_taskService.ErrorTaskFeedback(item, true);
			}
			}
			@@ -86,10 +91,6 @@
			catch (Exception ex)
			{
			content.Error(ex.Message);
			}
			finally
			{
			_trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "ä¸åååè½¦æ°å»ºå¥åºä»»å¡", "", "");
			}
			}

			@@ -119,6 +120,7 @@
			keepRobot = 1,
			keepRobotTimeout = 1
			};
			fOURBOTnewMovePodTask.requestID += item.TaskId;
			fOURBOTnewMovePodTask.desType = 1;
			fOURBOTnewMovePodTask.desNodeID = item.NextAddress;
			string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
			@@ -134,6 +136,7 @@
			}
			//FOURBOTnewMovePodTaskResponseData fOURBO = fOURBOTReturn.data as FOURBOTnewMovePodTaskResponseData ?? throw new Exception("æªè·åå°ååè½¦è¿åçä»»å¡ID");
			item.RGVTaskId = fOURBO.taskID;
			item.Dispatchertime = DateTime.Now;
			item.TaskState = (int)TaskStatusEnum.TakeFinish;
			}
			}
			@@ -180,6 +183,8 @@
			};
			requestData = request; // ä¿åè¯·æ±æ°æ®ç¨äºæ¥å¿
			//content.candidatePodIDs = tasks.Select(x => x.PalletCode).ToList();
			//string response = HttpHelper.Post("http://127.0.0.1:4523/m2/6165241-5857331-default/440906899?apifoxApiId=440906899", request.Serialize());

			string response = HttpHelper.Post(apiInfo.ApiAddress, request.Serialize());
			FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
			content.OK(data: fOURBOTReturn);
			@@ -206,7 +211,10 @@
			#endregion
			var responseContent = AddMoveTask(item.blockPods, task);//æ·»å ç§»åºä»»å¡
			if (!responseContent.Status) task.ExceptionMessage = responseContent.Message;
			else task.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute;
			else
			{
			task.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute;
			}
			dt_Tasks.Add(task);
			}
			else
			@@ -274,6 +282,7 @@
			{
			autoToRest = 1
			};
			fOURBOTnewMovePodTask.requestID = DateTime.Now.ToString("yyyyMMddHHmmssfff") + item.TaskId;
			item.CurrentAddress = item.NextAddress;
			item.NextAddress = rGVLocationInfo.LocationCode;
			item.TargetAddress = rGVLocationInfo.LocationCode;
			@@ -288,17 +297,17 @@
			var fOURBO = data.DeserializeObject<FOURBOTnewMovePodTaskResponseData>();
			item.RGVTaskId = fOURBO.taskID;
			item.TaskState = (int)TaskStatusEnum.Puting;

			rGVLocationInfo.LocationStatus = LocationStatusEnum.InLock.ObjToInt();
			item.Dispatchertime = DateTime.Now;
			locationsToUpdate.Add(rGVLocationInfo);

			#region éæ¾å¥åºç«å°
			//var stationManger = _stationMangerService.GetInStationInfo(item.SourceAddress);
			//if (stationManger != null)
			//{
			// stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
			// stationsToUpdate.Add(stationManger);
			//}
			var stationManger = _stationMangerService.GetInStationInfo(item.SourceAddress);
			if (stationManger != null)
			{
			stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
			stationsToUpdate.Add(stationManger);
			}
			content.OK();
			#endregion
			}
			@@ -316,6 +325,10 @@
			item.ExceptionMessage = $"å¤çä»»å¡å¼å¸¸ï¼{ex.Message}";
			//WriteError($"{nameof(TaskJob)}-{item.TaskId}", ex.Message, ex);
			content.Error($"ååè½¦æ¥å£è¿åéè¯¯ï¼{ex.Message}");
			}
			finally
			{

			}
			}
			#region MyRegion
			@@ -401,8 +414,8 @@
			_taskService.UpdateData(tasksToUpdate);
			if (locationsToUpdate.Any())
			_rGVLocationInfoService.UpdateData(locationsToUpdate);
			//if (stationsToUpdate.Any())
			// _stationMangerService.UpdateData(stationsToUpdate);
			if (stationsToUpdate.Any())
			_stationMangerService.UpdateData(stationsToUpdate);

			_unitOfWorkManage.CommitTran();
			}
			@@ -467,6 +480,7 @@
			}
			item.RGVTaskId = fOURBO.taskID;
			item.TaskState = (int)TaskStatusEnum.Puting;
			item.Dispatchertime = DateTime.Now;
			}
			}
			_taskService.UpdateData(tasks);
			@@ -571,6 +585,7 @@
			var task = tasks.First(x => x.PalletCode == item.podID);
			task.RGVTaskId = item.taskID;
			task.TaskState = TaskStatusEnum.RGV_MoveTaskSend.ObjToInt();
			task.Dispatchertime = DateTime.Now;
			dt_Tasks.Add(task);
			}
			_taskService.UpdateData(dt_Tasks);
			@@ -595,10 +610,11 @@
			{
			foreach (var item in tasks)
			{
			var takes = _taskService.Repository.QueryFirst(x => x.Roadway == item.Roadway && x.TaskType == (int)TaskTypeEnum.CPMoveInventory);
			var takes = _taskService.Repository.QueryFirst(x => x.Roadway == item.Roadway && x.TaskType == (int)TaskTypeEnum.CPMoveInventory && (x.TaskState == (int)TaskStatusEnum.RGV_NewMoveTask \|\| x.TaskState == (int)TaskStatusEnum.RGV_MoveTaskSend));
			if (takes == null)
			{
			item.TaskState = (int)TaskStatusEnum.RGV_WaitSend;
			item.Dispatchertime = DateTime.Now;
			}
			}
			_taskService.UpdateData(tasks);
			@@ -643,7 +659,7 @@
			autoToRest = 1
			};
			fOURBOTnewMovePodTask.desType = 5;
			fOURBOTnewMovePodTask.requestID = DateTime.Now.ToString("yyyyMMddHHmmss") + i;
			fOURBOTnewMovePodTask.requestID = DateTime.Now.ToString("yyyyMMddHHmmssfff") + item.TaskId;
			string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
			FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
			content.OK(data: fOURBOTReturn);
			@@ -657,6 +673,7 @@
			}
			item.RGVTaskId = fOURBO.taskID;
			item.TaskState = (int)TaskStatusEnum.Execut;
			item.Dispatchertime = DateTime.Now;
			//stationManger.IsOccupied = LocationStatusEnum.Lock.ObjToInt();
			//_stationMangerService.UpdateData(stationManger);
			}