From 2f75b4c0a67ccc3a443e7cc4f2f0f909defd9a92 Mon Sep 17 00:00:00 2001 From: hutongqing <hutongqing@hnkhzn.com> Date: 星期五, 01 十一月 2024 09:49:23 +0800 Subject: [PATCH] 版本更新 --- WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 53 ++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 36 insertions(+), 17 deletions(-) diff --git a/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs b/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs index 6b66899..a6002ad 100644 --- a/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs +++ b/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs @@ -18,13 +18,16 @@ using SqlSugar; using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Text; using System.Threading.Tasks; using WIDESEAWCS_Core; using WIDESEAWCS_Core.BaseServices; +using WIDESEAWCS_Core.Enums; using WIDESEAWCS_DTO.TaskInfo; using WIDESEAWCS_Model.Models; +using WIDESEAWCS_Common.TaskEnum; namespace WIDESEAWCS_ITaskInfoService { @@ -50,39 +53,47 @@ /// </summary> /// <param name="taskDTOs">WMS浠诲姟瀵硅薄闆嗗悎</param> /// <returns>杩斿洖澶勭悊缁撴灉</returns> - WebResponseContent ReceiveWMSTask(List<WMSTaskDTO> taskDTOs); + WebResponseContent ReceiveWMSTask([NotNull] List<WMSTaskDTO> taskDTOs); /// <summary> - /// + /// 鏍规嵁鎵樼洏鍙枫�佽捣濮嬪湴鍧�鍚慦MS璇锋眰浠诲姟 /// </summary> - /// <param name="palletCode"></param> - /// <param name="sourceAddress"></param> + /// <param name="palletCode">鎵樼洏鍙�</param> + /// <param name="sourceAddress">璧峰鍦板潃</param> /// <returns></returns> - WebResponseContent RequestWMsTask(string palletCode, string sourceAddress); + WebResponseContent RequestWMSTask(string palletCode, string sourceAddress); /// <summary> - /// + /// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎鏈墽琛岀殑浠诲姟 /// </summary> - /// <param name="deviceNo"></param> - /// <param name="currentAddress"></param> + /// <param name="deviceNo">璁惧缂栧彿</param> + /// <param name="currentAddress">褰撳墠鍦板潃</param> /// <returns></returns> Dt_Task QueryConveyorLineTask(string deviceNo, string currentAddress); /// <summary> - /// + /// 鏍规嵁浠诲姟鍙枫�佷笅涓�鍦板潃鏌ヨ杈撻�佺嚎鎵ц涓殑浠诲姟 /// </summary> - /// <param name="taskNum"></param> - /// <param name="nextAddress"></param> + /// <param name="taskNum">浠诲姟鍙�</param> + /// <param name="nextAddress">涓嬩竴鍦板潃</param> /// <returns></returns> Dt_Task QueryExecutingConveyorLineTask(int taskNum, string nextAddress); /// <summary> - /// + /// 鏍规嵁浠诲姟鍙枫�佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎瀹屾垚鐨勪换鍔� /// </summary> - /// <param name="taskNum"></param> - /// <param name="currentAddress"></param> + /// <param name="taskNum">浠诲姟鍙�</param> + /// <param name="currentAddress">褰撳墠鍦板潃</param> /// <returns></returns> Dt_Task QueryCompletedConveyorLineTask(int taskNum, string currentAddress); + + /// <summary> + /// 鏍规嵁璁惧缂栧彿銆佷换鍔$被鍨嬪垎缁�(鍙��)鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鏂板鐨勪换鍔� + /// </summary> + /// <param name="deviceNo">璁惧缂栧彿</param> + /// <param name="taskTypeGroup">浠诲姟绫诲瀷鍒嗙粍(鍙��)</param> + /// <returns></returns> + Dt_Task? QuertStackerCraneTask(string deviceNo, TaskTypeGroup? taskTypeGroup = null); /// <summary> /// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鏂板鐨勪换鍔� @@ -137,10 +148,18 @@ WebResponseContent UpdateTaskStatusToNext(int taskNum); /// <summary> - /// + /// 灏嗕换鍔$姸鎬佷慨鏀逛负涓嬩竴涓姸鎬� /// </summary> - /// <param name="taskNum"></param> - /// <param name="currentAddress"></param> + /// <param name="task">浠诲姟瀹炰綋瀵硅薄</param> + /// <returns></returns> + WebResponseContent UpdateTaskStatusToNext([NotNull] Dt_Task task); + + /// <summary> + /// 鏍规嵁浠诲姟鍙枫�佸綋鍓嶅湴鍧�鏇存柊浠诲姟浣嶇疆淇℃伅 + /// </summary> + /// <param name="taskNum">浠诲姟鍙�</param> + /// <param name="currentAddress">褰撳墠鍦板潃</param> + /// <returns></returns> Dt_Task? UpdatePosition(int taskNum, string currentAddress); /// <summary> -- Gitblit v1.9.3