´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -1125,28 +1125,28 @@ #endregion #region å建ååè½¦ä»»å¡ var task = BaseDal.QueryFirst(x => x.PalletCode == iQC.ContainerCode && x.SourceAddress == iQC.StationCode && x.TaskState == (int)TaskStatusEnum.New); //var task = BaseDal.QueryFirst(x => x.PalletCode == iQC.ContainerCode && x.SourceAddress == iQC.StationCode && x.TaskState == (int)TaskStatusEnum.New); #endregion #region å¼å«åå车 apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(FOURBOTnewMovePodTask)) ?? throw new Exception("æªæ¾å°åå车任å¡ä¸åæ¥å£é 置信æ¯ï¼è¯·æ£æ¥æ¥å£é ç½®"); FOURBOTnewMovePodTask fOURBOTnewMovePodTask = new() { priority = task.Grade, podID = task.PalletCode, //desNodeID = task.SourceAddress, desExt = new { unload = 0//æ¯å¦æ¾ä¸å®¹å¨,0å¦1æ¯ }, desStationCodes = task.SourceAddress, desType = 5 }; response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize()); fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>(); content.Data = fOURBOTReturn; if (fOURBOTReturn.returnCode != 0) throw new Exception(fOURBOTReturn.returnUserMsg); task.TaskState = (int)TaskStatusEnum.Execut; BaseDal.UpdateData(task); //apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(FOURBOTnewMovePodTask)) ?? throw new Exception("æªæ¾å°åå车任å¡ä¸åæ¥å£é 置信æ¯ï¼è¯·æ£æ¥æ¥å£é ç½®"); //FOURBOTnewMovePodTask fOURBOTnewMovePodTask = new() //{ // priority = task.Grade, // podID = task.PalletCode, // //desNodeID = task.SourceAddress, // desExt = new // { // unload = 0//æ¯å¦æ¾ä¸å®¹å¨,0å¦1æ¯ // }, // desStationCodes = task.SourceAddress, // desType = 5 //}; //response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize()); //fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>(); //content.Data = fOURBOTReturn; //if (fOURBOTReturn.returnCode != 0) throw new Exception(fOURBOTReturn.returnUserMsg); //task.TaskState = (int)TaskStatusEnum.Execut; //BaseDal.UpdateData(task); #endregion return WebResponseContent.Instance.OK(); } ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs
@@ -20,13 +20,75 @@ { public partial class TaskJob { #region ä¸åååè½¦å ¥åºä»»å¡ /// <summary> /// ä¸ååå车æ°å»ºå ¥åºä»»å¡ /// </summary> /// <param name="tasks"></param> public void SendRGVInTask(List<Dt_Task> tasks) public void SendRGVNewInTask(List<Dt_Task> tasks) { FOURBOTnewMovePodTask fOURBOTnewMovePodTask = new(); WebResponseContent content = new WebResponseContent(); 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, podID = task.PalletCode, desExt = new { unload = 0//æ¯å¦æ¾ä¸å®¹å¨,0å¦1æ¯ }, desStationCodes = task.SourceAddress, desType = 5 }; fOURBOTnewMovePodTask.requestID += i; try { string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize()); FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>(); content.Data = fOURBOTReturn; if (fOURBOTReturn.returnCode != 0) throw new Exception(fOURBOTReturn.returnUserMsg); string dataJson = fOURBOTReturn.data.ToString(); FOURBOTnewMovePodTaskResponseData? fOURBO = JsonConvert.DeserializeObject<FOURBOTnewMovePodTaskResponseData>(dataJson); if (fOURBO == null || fOURBO.taskID == 0) { throw new Exception($"æªè·åå°åå车è¿åçä»»å¡IDï¼è¿åæ°æ®ï¼{response}"); } //FOURBOTnewMovePodTaskResponseData fOURBO = fOURBOTReturn.data as FOURBOTnewMovePodTaskResponseData ?? throw new Exception("æªè·åå°åå车è¿åçä»»å¡ID"); task.RGVTaskId = fOURBO.taskID; task.ExceptionMessage = ""; task.TaskState = (int)TaskStatusEnum.Execut; } catch (Exception ex) { task.ExceptionMessage = ex.Message; } } _taskService.UpdateData(tasks); content.OK(); } catch (Exception ex) { content.Error(ex.Message); } finally { _trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "ä¸ååå车æ°å»ºå ¥åºä»»å¡", "", ""); } } #region /// <summary> /// ä¸ååå车å¤å½¢æ£æµä»»å¡ /// </summary> /// <param name="tasks"></param> public void SendRGVCheckShapeTask(List<Dt_Task> tasks) { FOURBOTnewMovePodTask fOURBOTnewMovePodTask = new(); WebResponseContent content = new WebResponseContent(); ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs
@@ -23,7 +23,7 @@ try { var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskType == (int)TaskTypeEnum.CPInbound && x.TaskState == (int)TaskStatusEnum.WaiCheckShape).ToList(); if (newTasks.Count > 0) SendRGVInTask(newTasks); if (newTasks.Count > 0) SendRGVCheckShapeTask(newTasks); newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.New).ToList(); if (newTasks.Count > 0) { @@ -33,8 +33,8 @@ #endregion #region æ¥æ¾RGVä»»å¡ //Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPInbound).ToList(); //if (Tasks.Count > 0) SendRGVInTask(Tasks); Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPInbound).ToList(); if (Tasks.Count > 0) SendRGVNewInTask(Tasks); Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPOutbound).ToList(); if (Tasks.Count > 0) IsMoveTask(Tasks); #endregion