From 4d2b6fea8d08c95bd6bb2b8c2b1228383110457e Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 09 四月 2026 12:48:46 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs"
index 02d377e..5c7d346 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs"
@@ -47,7 +47,7 @@
desStationCodes = task.SourceAddress,
desType = 5
};
- fOURBOTnewMovePodTask.requestID += i;
+ fOURBOTnewMovePodTask.requestID += task.TaskId;
try
{
string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
@@ -65,13 +65,23 @@
task.RGVTaskId = fOURBO.taskID;
task.ExceptionMessage = "";
task.TaskState = (int)TaskStatusEnum.Execut;
+ task.Dispatchertime=DateTime.Now;
}
catch (Exception ex)
{
task.ExceptionMessage = ex.Message;
}
}
- _taskService.UpdateData(tasks);
+ var uptasks = tasks.Where(task => string.IsNullOrEmpty(task.ExceptionMessage)).ToList();
+ if (uptasks.Count() > 0) _taskService.UpdateData(uptasks);
+ var errortasks = tasks.Where(task => !string.IsNullOrEmpty(task.ExceptionMessage)).ToList();
+ if (errortasks.Count() > 0)
+ {
+ foreach (var item in errortasks)
+ {
+ _taskService.ErrorTaskFeedback(item, true);
+ }
+ }
content.OK();
}
catch (Exception ex)
@@ -110,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());
@@ -125,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;
}
}
@@ -137,7 +149,7 @@
}
finally
{
- _trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "涓嬪彂鍥涘悜杞︽柊寤哄叆搴撲换鍔�", "", "");
+ _trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "涓嬪彂鍥涘悜杞﹀褰㈡娴嬩换鍔�", "", "");
}
}
#endregion
@@ -197,7 +209,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
@@ -265,6 +280,7 @@
{
autoToRest = 1
};
+ fOURBOTnewMovePodTask.requestID = DateTime.Now.ToString("yyyyMMddHHmmssfff") + item.TaskId;
item.CurrentAddress = item.NextAddress;
item.NextAddress = rGVLocationInfo.LocationCode;
item.TargetAddress = rGVLocationInfo.LocationCode;
@@ -279,8 +295,8 @@
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 閲婃斁鍏ュ簱绔欏彴
@@ -307,6 +323,10 @@
item.ExceptionMessage = $"澶勭悊浠诲姟寮傚父锛歿ex.Message}";
//WriteError($"{nameof(TaskJob)}-{item.TaskId}", ex.Message, ex);
content.Error($"鍥涘悜杞︽帴鍙ｈ繑鍥為敊璇細{ex.Message}");
+ }
+ finally
+ {
+
}
}
#region MyRegion
@@ -412,7 +432,7 @@
}
finally
{
- _trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "涓嬪彂澶栧舰妫�娴嬩换鍔″け璐�", "", "");
+ _trackloginfoService.AddTrackLog(fOURBOTnewMovePodTask, content, "涓嬪彂澶栧舰妫�娴嬫垚鍔熶换鍔�", "", "");
}
}
#endregion
@@ -458,6 +478,7 @@
}
item.RGVTaskId = fOURBO.taskID;
item.TaskState = (int)TaskStatusEnum.Puting;
+ item.Dispatchertime = DateTime.Now;
}
}
_taskService.UpdateData(tasks);
@@ -562,6 +583,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);
@@ -590,6 +612,7 @@
if (takes == null)
{
item.TaskState = (int)TaskStatusEnum.RGV_WaitSend;
+ item.Dispatchertime = DateTime.Now;
}
}
_taskService.UpdateData(tasks);
@@ -634,7 +657,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);
@@ -648,6 +671,7 @@
}
item.RGVTaskId = fOURBO.taskID;
item.TaskState = (int)TaskStatusEnum.Execut;
+ item.Dispatchertime = DateTime.Now;
//stationManger.IsOccupied = LocationStatusEnum.Lock.ObjToInt();
//_stationMangerService.UpdateData(stationManger);
}
--
Gitblit v1.9.3