From 4bc0e18b94a2bf17c1b7277910d63ef82fbe616a Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 10 一月 2025 09:39:51 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
index 102fe3a..d364d1a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
@@ -23,6 +23,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_DTO.Agv;
+using WIDESEAWCS_Common.APIEnum;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
@@ -138,7 +139,7 @@
/// </summary>
/// <param name="taskModel"></param>
/// <returns></returns>
- WebResponseContent AgvSendTask(AgvTaskDTO taskModel);
+ WebResponseContent AgvSendTask(AgvTaskDTO taskModel, APIEnum SendTask = APIEnum.Agv_CSJSendTask);
/// <summary>
/// 瀹夊叏淇″彿鐢宠
/// </summary>
@@ -150,12 +151,34 @@
/// </summary>
/// <param name="secureModel"></param>
/// <returns></returns>
- WebResponseContent AgvSecureReply(AgvSecureReplyDTO secureReplyModel);
+ WebResponseContent AgvSecureReply(AgvSecureReplyDTO secureReplyModel, APIEnum SecureReply = APIEnum.Agv_CSJSecureReply);
/// <summary>
/// AGV浠诲姟鐘舵�佸埛鏂�
/// </summary>
/// <param name="agvUpdateModel"></param>
/// <returns></returns>
AgvResponseContent AgvUpdateTask(AgvUpdateDTO agvUpdateModel);
+
+ WebResponseContent SendSecureReplyToAgv(int taskNum);
+
+ /// <summary>
+ /// 鏇存柊浠诲姟淇℃伅鍙婃坊鍔犱换鍔℃槑缁嗚褰�
+ /// </summary>
+ /// <param name="task"></param>
+ /// <param name="deviceCode"></param>
+ /// <param name="sourceAddress"></param>
+ /// <param name="targetAddress"></param>
+ /// <param name="currentAddress"></param>
+ /// <param name="nextAddress"></param>
+ /// <param name="taskStatus"></param>
+ void UpdateTask(Dt_Task task, TaskStatusEnum taskStatus, string deviceCode = "", string sourceAddress = "", string targetAddress = "", string currentAddress = "", string nextAddress = "");
+
+ /// <summary>
+ /// 璇锋眰鍒嗛厤宸烽亾
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <param name="roadwayNos"></param>
+ /// <returns></returns>
+ WebResponseContent RequestWMSAssignRoadway(int taskNum, List<string> roadwayNos);
}
}
--
Gitblit v1.9.3