From df97e66f99cf081abf212a8d97fc32afe9c6e7a7 Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期五, 17 一月 2025 13:46:32 +0800 Subject: [PATCH] 更新配置文件PDA版本 --- 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 139 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 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 675e229..b501222 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" @@ -22,10 +22,13 @@ using System.Linq; 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; using WIDESEAWCS_Core.Enums; +using WIDESEAWCS_DTO.Agv; using WIDESEAWCS_DTO.TaskInfo; using WIDESEAWCS_Model.Models; @@ -46,7 +49,7 @@ /// <summary> /// 鎵�鏈夊嚭搴撲换鍔$被鍨� /// </summary> - public List<int> TaskOutboundTypes { get; } + public List<int> TaskOutboundTypes { get; } /// <summary> /// 鎺ユ敹WMS浠诲姟淇℃伅 @@ -63,7 +66,56 @@ /// <returns></returns> WebResponseContent RequestWMSTask(string palletCode, string sourceAddress); + /// <summary> + /// 鍚慦MS鐢宠浠诲姟 + /// </summary> + /// <param name="palletCode">鎵樼洏鍙�</param> + /// <param name="sourceAddress">璧峰鍦板潃</param> + /// <returns></returns> + WebResponseContent RequestWMSTaskSimple(string palletCode, string sourceAddress); + + /// <summary> + /// 鍚慦MS鐢宠浠诲姟 + /// </summary> + /// <param name="palletCode">鎵樼洏鍙�</param> + /// <param name="sourceAddress">璧峰鍦板潃</param> + /// <param name="roadway">宸烽亾鍙�</param> + /// <returns></returns> + WebResponseContent RequestWMSTask(string palletCode, string sourceAddress, string roadway); + + /// <summary> + /// + /// </summary> + /// <param name="sourceAddress"></param> + /// <param name="palletCode"></param> + /// <param name="heightType"></param> + /// <param name="roadways"></param> + /// <returns></returns> + WebResponseContent RequestWMSTask(string palletCode, string sourceAddress, int heightType, List<string> roadways); + + /// <summary> + /// 鍚慦MS鐢宠鍒嗛厤璐т綅 + /// </summary> + /// <param name="taskNum">浠诲姟鍙�</param> + /// <param name="roadwayNo">宸烽亾鍙�</param> + /// <returns></returns> string? RequestAssignLocation(int taskNum, string roadwayNo); + + /// <summary> + /// 鍚慦MS鐢宠鍒嗛厤璐т綅 + /// </summary> + /// <param name="taskNum">浠诲姟鍙�</param> + /// <param name="roadwayNo">宸烽亾鍙�</param> + /// <param name="heightType">楂樺害</param> + /// <returns></returns> + string? RequestAssignLocationByHeight(int taskNum, string roadwayNo, int heightType); + + /// <summary> + /// 浠诲姟瀹屾垚 + /// </summary> + /// <param name="taskNum">浠诲姟鍙�</param> + /// <returns></returns> + WebResponseContent TaskCompleted(int taskNum); /// <summary> /// 鏍规嵁璁惧缂栧彿銆佷换鍔$被鍨嬪垎缁�(鍙��)鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鏂板鐨勪换鍔� @@ -118,12 +170,95 @@ /// <param name="taskNum">浠诲姟鍙�</param> /// <returns>杩斿洖澶勭悊缁撴灉</returns> WebResponseContent TaskStatusRecovery(int taskNum); - /// <summary> /// 鍥炴粴浠诲姟鐘舵�� /// </summary> /// <param name="taskNum">浠诲姟鍙�</param> /// <returns>杩斿洖澶勭悊缁撴灉</returns> WebResponseContent RollbackTaskStatusToLast(int taskNum); + /// <summary> + /// 鍙戦�丄GV浠诲姟 + /// </summary> + /// <param name="taskModel"></param> + /// <returns></returns> + WebResponseContent AgvSendTask(AgvTaskDTO taskModel, APIEnum SendTask = APIEnum.Agv_CSJSendTask); + /// <summary> + /// 瀹夊叏淇″彿鐢宠 + /// </summary> + /// <param name="secureApplyModel"></param> + /// <returns></returns> + AgvResponseContent AgvSecureApply(AgvSecureApplyDTO secureApplyModel); + /// <summary> + /// 瀹夊叏淇″彿鍥炲 WCS-AGV + /// </summary> + /// <param name="secureModel"></param> + /// <returns></returns> + WebResponseContent AgvSecureReply(AgvSecureReplyDTO secureReplyModel, APIEnum SecureReply = APIEnum.Agv_CSJSecureReply); + /// <summary> + /// AGV浠诲姟鐘舵�佸埛鏂� + /// </summary> + /// <param name="agvUpdateModel"></param> + /// <returns></returns> + AgvResponseContent AgvUpdateTask(AgvUpdateDTO agvUpdateModel); + + /// <summary> + /// + /// </summary> + /// <param name="taskNum"></param> + /// <returns></returns> + WebResponseContent SendSecureReplyToAgv(int taskNum); + + /// <summary> + /// 鏇存柊浠诲姟淇℃伅鍙婃坊鍔犱换鍔℃槑缁嗚褰� + /// </summary> + /// <param name="task">浠诲姟鍘熷璞″疄渚�(鏈慨鏀圭殑鏁版嵁瀵硅薄)</param> + /// <param name="taskStatus">淇敼鍚庣殑浠诲姟鐘舵��</param> + /// <param name="deviceCode">淇敼鍚庣殑璁惧缂栧彿</param> + /// <param name="sourceAddress">淇敼鍚庣殑璧峰鍦板潃</param> + /// <param name="targetAddress">淇敼鍚庣殑鐩爣鍦板潃</param> + /// <param name="currentAddress">淇敼鍚庣殑褰撳墠鍦板潃</param> + /// <param name="nextAddress">淇敼鍚庣殑涓嬩竴鍦板潃</param> + void UpdateTask(Dt_Task task, TaskStatusEnum taskStatus, string deviceCode = "", string sourceAddress = "", string targetAddress = "", string currentAddress = "", string nextAddress = "", string roadwayNo = ""); + + /// <summary> + /// 璇锋眰鍒嗛厤宸烽亾 + /// </summary> + /// <param name="taskNum"></param> + /// <param name="roadwayNos"></param> + /// <returns></returns> + WebResponseContent RequestWMSAssignRoadway(int taskNum, List<string> roadwayNos); + + /// <summary> + /// + /// </summary> + /// <param name="roadwayNos"></param> + /// <param name="palletCode"></param> + /// <param name="heightType"></param> + /// <returns></returns> + WebResponseContent RequestWMSAssignRoadway(List<string> roadwayNos, string palletCode, int heightType); + + /// <summary> + /// + /// </summary> + /// <param name="roadwayNos"></param> + /// <param name="taskNum"></param> + /// <param name="heightType"></param> + /// <returns></returns> + WebResponseContent RequestWMSAssignRoadway(List<string> roadwayNos, int taskNum, int heightType); + + /// <summary> + /// + /// </summary> + /// <param name="roadwayNos"></param> + /// <returns></returns> + WebResponseContent RequestWMSAssignRoadway(List<string> roadwayNos); + + /// <summary> + /// + /// </summary> + /// <param name="agvPodModel"></param> + /// <param name="PodBerthAndMat"></param> + /// <returns></returns> + WebResponseContent AgvPodBerthAndMat(AgvPodBerthAndMatDTO agvPodModel, APIEnum PodBerthAndMat = APIEnum.Agv_CSJPodBerthAndMat); } } -- Gitblit v1.9.3