From c6e8b600398de38b6684f5fa1eaaaade8562859b Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期六, 20 九月 2025 15:16:56 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu --- 项目代码/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 79 +++++++++++++++++++++++---------------- 1 files changed, 46 insertions(+), 33 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs" index d375bea..192bf13 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs" @@ -73,6 +73,13 @@ /// <returns></returns> WebResponseContent RequestYLWMSTaskSimple(string palletCode, string sourceAddress, int taskNum = 0); + /// <summary> + /// 鍏ュ簱鐢宠 + /// </summary> + /// <param name="palletCode">鏉$爜</param> + /// <returns></returns> + WebResponseContent YLPurchaseBoxing(string palletCode); + WebResponseContent AssignCPRoadwayNo(); // <summary> @@ -88,6 +95,14 @@ /// /// <param name="roadWay">宸烽亾</param> /// <returns></returns> WebResponseContent RequestWMSTaskSimple(string palletCode, string sourceAddress, string roadWay="", int taskType = 630,int taskNum=0,string targetAddress=""); + + /// <summary> + /// 鍙犵洏鏈虹敵璇风┖鎵樺叆鎴愬搧搴� + /// </summary> + /// <param name="palletCode"></param> + /// <param name="SourceAddress"></param> + /// <returns></returns> + WebResponseContent CPEmptyInbound(string palletCode, string SourceAddress); /// <summary> /// 鍚慦MS鐢宠浠诲姟 @@ -212,39 +227,6 @@ void UpdateTask(Dt_Task task, TaskStatusEnum taskStatus, string deviceCode = "", string sourceAddress = "", string targetAddress = "", string currentAddress = "", string nextAddress = "", string roadwayNo = "", int heightType = 0); /// <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> @@ -275,5 +257,36 @@ /// <param name="taskNum"></param> /// <returns></returns> public WebResponseContent RecWMSTaskCompleted(int taskNum); + + /// <summary> + /// 鏍规嵁鎵樼洏鍙枫�佸綋鍓嶅湴鍧�鏌ヨAGV瀹屾垚鐨勪换鍔� + /// </summary> + /// <param name="Barcode">鎵樼洏鍙�</param> + /// <param name="currentAddress">褰撳墠鍦板潃</param> + /// <returns></returns> + Dt_Task QueryBarCodeAGVFinishTask(int TaskNum, string currentAddress); + + /// <summary> + /// 鏍规嵁鎵樼洏鍙枫�佷笅涓�鍦板潃鏌ヨ杈撻�佺嚎鎵ц涓殑浠诲姟 + /// </summary> + /// <param name="taskNum">浠诲姟鍙�</param> + /// <param name="nextAddress">涓嬩竴鍦板潃</param> + /// <returns></returns> + Dt_Task QueryExecutingTaskByBarcode(int TaskNum, string nextAddress); + + /// <summary> + /// 鏍规嵁鎵樼洏鍙枫�佷笅涓�鍦板潃鏌ヨ杈撻�佺嚎寰呮墽琛岀殑浠诲姟 + /// </summary> + /// <param name="taskNum">浠诲姟鍙�</param> + /// <param name="nextAddress">涓嬩竴鍦板潃</param> + /// <returns></returns> + Dt_Task QueryLineExecuteTaskByBarcode(int TaskNum, string nextAddress); + + /// <summary> + /// 灏嗕换鍔$姸鎬佷慨鏀逛负涓嬩竴涓姸鎬� + /// </summary> + /// <param name="task">浠诲姟瀹炰綋瀵硅薄</param> + /// <returns></returns> + WebResponseContent UpdateTaskStatusToNext([NotNull] Dt_Task task, Dt_StationManger stationManger = null); } } -- Gitblit v1.9.3