From b7f53ba61fbc1844d7b92ff852762b140d46ab54 Mon Sep 17 00:00:00 2001 From: huanghongfeng <huanghongfeng@hnkhzn.com> Date: 星期一, 23 六月 2025 19:58:16 +0800 Subject: [PATCH] 最新 --- 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 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 a424ed1..b8cc630 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; @@ -69,13 +70,20 @@ /// <param name="palletCode">鎵樼洏鍙�</param> /// <param name="sourceAddress">璧峰鍦板潃</param> /// <returns></returns> - WebResponseContent ToPlatform(string palletCode ); + WebResponseContent ToPlatform(string palletCode); /// <summary> /// 鐢熸垚绌烘墭鍑哄簱浠诲姟 /// </summary> /// <param name="sourceAddress"></param> /// <returns></returns> - WebResponseContent RequestWMSTask2(string sourceAddress); + 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> @@ -83,6 +91,7 @@ /// <param name="outStationCodes">褰撳墠鍦板潃</param> /// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄闆嗗悎锛屽彲鑳戒负null</returns> Dt_Task RequestWMSTaskMovelibrary(Dt_Task task); + Dt_Task RequestWMSTaskMovelibrary2(Dt_Task task); /// <summary> /// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎鏈墽琛岀殑浠诲姟 /// </summary> @@ -124,12 +133,26 @@ Dt_Task QueryStackerCraneTask(string deviceNo, string currentAddress = ""); /// <summary> + /// 鏍规嵁璁惧缂栧彿锛屾煡璇㈠綋鍓嶅爢鍨涙満鐨勪换鍔� + /// </summary> + /// <param name="deviceNo">璁惧缂栧彿</param> + /// <returns></returns> + List<Dt_Task> CraneTaskList(string deviceNo); + + /// <summary> + /// 鏌ョ湅鍫嗗灈鏈哄綋鍓嶆槸鍚︽湁浠诲姟 + /// </summary> + /// <param name="deviceNo"></param> + /// <returns></returns> + Dt_Task CutStackerCraneTask(string deviceNo); + /// <summary> /// 鏍规嵁璁惧缂栧彿鏌ュ綋鍓嶅湪鍋氫换鍔″彿 /// </summary> /// <param name="deviceNo">璁惧缂栧彿</param> /// <param name="currentAddress">褰撳墠鍦板潃</param> /// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns> Dt_Task IngStackerCraneTask(string deviceNo); + Dt_Task IngStackerCraneTask2(string deviceNo); /// <summary> /// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鍏ュ簱绫诲瀷鐨勬柊澧炵殑浠诲姟 @@ -163,6 +186,8 @@ /// <param name="outStationCodes">褰撳墠鍦板潃</param> /// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄闆嗗悎锛屽彲鑳戒负null</returns> List<Dt_Task> QueryStationIsOccupiedOutTasks(string deviceNo, string SourceAddress); + List<Dt_Task> QueryStationIsOccupiedOutTasks2(string deviceNo, string TargetAddress); + /// <summary> @@ -208,6 +233,13 @@ WebResponseContent StackCraneTaskCompleted(int taskNum); /// <summary> + /// 浠诲姟鍘嗗彶瀹屾垚 + /// </summary> + /// <param name="taskNum">浠诲姟缂栧彿</param> + /// <returns>杩斿洖澶勭悊缁撴灉</returns> + WebResponseContent StackCraneTashty(int taskNum); + + /// <summary> /// 鎭㈠鎸傝捣浠诲姟 /// </summary> /// <param name="taskNum">浠诲姟鍙�</param> @@ -220,5 +252,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