From 96e6dc957aee5d20218ac8127a28db6a7e6ba6de Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期五, 10 一月 2025 10:00:52 +0800 Subject: [PATCH] 1 --- 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 37 ++++++++++++++++++++++++++++++++++--- 1 files changed, 34 insertions(+), 3 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 6b97c18..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; @@ -47,7 +48,7 @@ /// <summary> /// 鎵�鏈夊嚭搴撲换鍔$被鍨� /// </summary> - public List<int> TaskOutboundTypes { get; } + public List<int> TaskOutboundTypes { get; } /// <summary> /// 鎺ユ敹WMS浠诲姟淇℃伅 @@ -64,7 +65,15 @@ /// <returns></returns> WebResponseContent RequestWMSTask(string palletCode, string sourceAddress); + /// <summary> + /// 鍚慦MS鐢宠鍒嗛厤璐т綅 + /// </summary> + /// <param name="taskNum">浠诲姟鍙�</param> + /// <param name="roadwayNo">宸烽亾鍙�</param> + /// <returns></returns> string? RequestAssignLocation(int taskNum, string roadwayNo); + + WebResponseContent TaskCompleted(int taskNum); /// <summary> /// 鏍规嵁璁惧缂栧彿銆佷换鍔$被鍨嬪垎缁�(鍙��)鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鏂板鐨勪换鍔� @@ -130,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> @@ -142,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