From e3aaaa22a7cee2b7c7a33e98f843abc0cd15fb1b Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 05 八月 2025 13:36:12 +0800
Subject: [PATCH] 同步
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/confirmToContinueTask.cs | 20 +++-----------------
1 files changed, 3 insertions(+), 17 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/confirmToContinueTask.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/confirmToContinueTask.cs"
index 2f7e0c1..c031418 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/confirmToContinueTask.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/confirmToContinueTask.cs"
@@ -17,7 +17,7 @@
public partial class ToAGVService
{
/// <summary>
- /// AGV鍥炶皟鎺ュ彛
+ /// AGV缁х画浠诲姟鎺ュ彛
/// </summary>
/// <param name="taskRespon"></param>
/// <returns></returns>
@@ -38,23 +38,9 @@
var task = _taskRepository.QueryFirst(x => x.AGVtaskId == taskResult.task_id);
if (task == null) throw new Exception($"鏈煡浠诲姟:{taskResult.task_id}");
- if (taskResult.result.ToLower() == "task_execute") //AGV寮�濮嬫墽琛�
- {
- task.TaskState = (int)TaskStatusEnum.Executing;
- _taskRepository.Update(task);
- }
+ var finishTask = _taskRepository.QueryFirst(x => x.Roadway == task.Roadway && x.TaskState == (int)TaskStatusEnum.Completed /*&& x.TargetAddress == task.TargetAddress*/);
+ if (finishTask != null) throw new Exception("褰撳墠浣嶇疆瀛樺湪鏈汉宸ョ‘璁ゅ畬鎴愪换鍔�,涓嶅厑璁告斁璐�");
- if (taskResult.result.ToLower() == "task_complete") //AGV浠诲姟缁撴潫
- {
- task.TaskState = (int)TaskStatusEnum.Completed;
-
- WebResponseContent responseContent = _taskService.CompleteAsync((int)task.TaskNum).Result;
- if (!responseContent.Status)
- {
- throw new Exception(responseContent.Message);
- }
- //_taskRepository.Update(task);
- }
return content.OK();
}
catch (Exception ex)
--
Gitblit v1.9.3