From 829eabf256e29392ca63f6da48829dba3b075dfe Mon Sep 17 00:00:00 2001 From: huanghongfeng <huanghongfeng@hnkhzn.com> Date: 星期五, 24 一月 2025 08:59:53 +0800 Subject: [PATCH] 资料,优化程序 --- 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 63 ++++++++++++++++++++++++++++--- 1 files changed, 56 insertions(+), 7 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 53010d4..cbe717c 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" @@ -15,6 +15,7 @@ *----------------------------------------------------------------*/ #endregion << 鐗� 鏈� 娉� 閲� >> +using OfficeOpenXml.FormulaParsing.Excel.Functions.Math; using SqlSugar; using System; using System.Collections.Generic; @@ -22,6 +23,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using WIDESEAWCS_Common.TaskEnum; using WIDESEAWCS_Core; using WIDESEAWCS_Core.BaseServices; using WIDESEAWCS_Core.Enums; @@ -52,13 +54,7 @@ /// </summary> /// <param name="taskDTOs">WMS浠诲姟瀵硅薄闆嗗悎</param> /// <returns>杩斿洖澶勭悊缁撴灉</returns> - WebResponseContent ReceiveWMSTask([NotNull] List<WMSTaskDTO> taskDTOs); - /// <summary> - /// 娴嬭瘯鍑哄簱鐢熸垚浠诲姟 - /// </summary> - /// <param name="taskDTOs"></param> - /// <returns></returns> - WebResponseContent RequestWMSTask2(); + WebResponseContent ReceiveWMSTask([NotNull] List<Dt_Task> taskDTOs); /// <summary> /// 鏍规嵁鎵樼洏鍙枫�佽捣濮嬪湴鍧�鍚慦MS璇锋眰浠诲姟 @@ -68,6 +64,33 @@ /// <returns></returns> WebResponseContent RequestWMSTask(string palletCode, string sourceAddress); + /// <summary> + /// 鏍规嵁鎵樼洏鏉$爜璁块棶wms杩涘叆鍝釜鍫嗗灈鏈虹珯鍙� + /// </summary> + /// <param name="palletCode">鎵樼洏鍙�</param> + /// <param name="sourceAddress">璧峰鍦板潃</param> + /// <returns></returns> + WebResponseContent ToPlatform(string palletCode); + /// <summary> + /// 鐢熸垚绌烘墭鍑哄簱浠诲姟 + /// </summary> + /// <param name="sourceAddress"></param> + /// <returns></returns> + WebResponseContent RequestWMSTask2(string palletCode,string sourceAddress); + /// <summary> + /// 鐢熸垚鍘熸潗鏂欏嚭搴撲俊鎭� + /// </summary> + /// <param name="sourceAddress"></param> + /// <returns></returns> + WebResponseContent RequestWMSTask3(string palletCode, int outCount,string Loc); + WebResponseContent RequestWMSTask4(); + /// <summary> + /// 鏍规嵁璁惧缂栧彿銆佽捣濮嬪湴鐐瑰垽鏂祬搴撲綅鏄惁鏈夎揣 + /// </summary> + /// <param name="deviceNo">璁惧缂栧彿</param> + /// <param name="outStationCodes">褰撳墠鍦板潃</param> + /// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄闆嗗悎锛屽彲鑳戒负null</returns> + Dt_Task RequestWMSTaskMovelibrary(Dt_Task task); /// <summary> /// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎鏈墽琛岀殑浠诲姟 /// </summary> @@ -109,12 +132,22 @@ Dt_Task QueryStackerCraneTask(string deviceNo, string currentAddress = ""); /// <summary> + /// 鏍规嵁璁惧缂栧彿鏌ュ綋鍓嶅湪鍋氫换鍔″彿 + /// </summary> + /// <param name="deviceNo">璁惧缂栧彿</param> + /// <param name="currentAddress">褰撳墠鍦板潃</param> + /// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns> + Dt_Task IngStackerCraneTask(string deviceNo); + Dt_Task IngStackerCraneTask2(string deviceNo); + + /// <summary> /// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鍏ュ簱绫诲瀷鐨勬柊澧炵殑浠诲姟 /// </summary> /// <param name="deviceNo">璁惧缂栧彿</param> /// <param name="currentAddress">褰撳墠鍦板潃</param> /// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns> Dt_Task QueryStackerCraneInTask(string deviceNo, string currentAddress = ""); + /// <summary> /// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鍑哄簱绫诲瀷鐨勬柊澧炵殑浠诲姟 @@ -132,6 +165,15 @@ /// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄闆嗗悎锛屽彲鑳戒负null</returns> List<Dt_Task> QueryStackerCraneOutTasks(string deviceNo, List<string> outStationCodes); + /// <summary> + /// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鍑哄簱绫诲瀷鐨勬柊澧炵殑浠诲姟 + /// </summary> + /// <param name="deviceNo">璁惧缂栧彿</param> + /// <param name="outStationCodes">褰撳墠鍦板潃</param> + /// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄闆嗗悎锛屽彲鑳戒负null</returns> + List<Dt_Task> QueryStationIsOccupiedOutTasks(string deviceNo, string SourceAddress); + + /// <summary> /// 鏇存柊浠诲姟寮傚父淇℃伅鏄剧ず /// </summary> @@ -187,5 +229,12 @@ /// <param name="taskNum">浠诲姟鍙�</param> /// <returns>杩斿洖澶勭悊缁撴灉</returns> WebResponseContent RollbackTaskStatusToLast(int taskNum); + + /// <summary> + /// 鍒犻櫎浠诲姟 + /// </summary> + /// <param name="taskDTOs"></param> + /// <returns></returns> + WebResponseContent ReceiveWCSTask(int tasknum); } } -- Gitblit v1.9.3