From 515866f63c9fbdb83de3f2016e4eaf2af99490d7 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期三, 15 一月 2025 11:32:52 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGV_CSJExtend.cs | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGV_CSJExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGV_CSJExtend.cs"
index 788399b..a56bf1b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGV_CSJExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGV_CSJExtend.cs"
@@ -53,6 +53,7 @@
{
agvTask.TaskState = TaskStatusEnum.AGV_Executing.ObjToInt();
//agvTask.Remark = content.Data.ObjToString();
+ _taskService.UpdateTask(agvTask, TaskStatusEnum.AGV_Executing);
}
else
{
@@ -88,6 +89,10 @@
{
if (WaitToTask.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
{
+ if (WaitToTasks.FirstOrDefault(x=>x.TaskState==TaskStatusEnum.AGV_Puting.ObjToInt() || x.TaskState == TaskStatusEnum.Finish.ObjToInt()) !=null)
+ {
+ continue;
+ }
Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x => x.AGVStationCode == WaitToTask.NextAddress);
if (stationManger == null)
{
@@ -143,14 +148,22 @@
taskCode = WaitToTask.AgvTaskNum,
};
WebResponseContent content = _taskService.AgvSecureReply(replyDTO);
- if (content.Status)
+ if (content.Status && WaitToTask.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
+ {
+ WaitToTask.TaskState = TaskStatusEnum.AGV_Puting.ObjToInt();
+ _taskService.UpdateTask(WaitToTask, TaskStatusEnum.AGV_Puting);
+ break;
+ }
+ else if (content.Status && WaitToTask.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
{
WaitToTask.TaskState = TaskStatusEnum.AGV_Executing.ObjToInt();
+ _taskService.UpdateTask(WaitToTask, TaskStatusEnum.AGV_Executing);
}
else
{
WaitToTask.TaskState = TaskStatusEnum.Exception.ObjToInt();
WaitToTask.ExceptionMessage = content.Message;
+ _taskService.UpdateTask(WaitToTask, TaskStatusEnum.Exception);
}
}
_taskService.UpdateData(WaitToTasks);
--
Gitblit v1.9.3