From e0e8c8f0b0abc141b116779afbcee970e091caaf Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 05 十二月 2025 09:48:09 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu

---
 项目代码/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 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 c56dc9a..1f44b21 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"
@@ -28,6 +28,7 @@
 using WIDESEAWCS_Core;
 using WIDESEAWCS_Core.BaseServices;
 using WIDESEAWCS_Core.Enums;
+using WIDESEAWCS_DTO;
 using WIDESEAWCS_DTO.Agv;
 using WIDESEAWCS_DTO.TaskInfo;
 using WIDESEAWCS_Model.Models;
@@ -78,7 +79,7 @@
         /// </summary>
         /// <param name="palletCode">鏉$爜</param>
         /// <returns></returns>
-        WebResponseContent YLPurchaseBoxing(string palletCode, decimal weight = 0, decimal thickness = 0, decimal wide = 0);
+        WebResponseContent YLPurchaseBoxing(string palletCode, decimal weight = 0, decimal thickness = 0, decimal wide = 0, string stationCode="");
 
         WebResponseContent AssignCPRoadwayNo();
 
@@ -95,6 +96,14 @@
         /// /// <param name="roadWay">宸烽亾</param>
         /// <returns></returns>
         WebResponseContent RequestWMSTaskSimple(string palletCode, string sourceAddress, string roadWay="", int taskType = 630,int taskNum=0,string targetAddress="");
+        //涓婁紶鏉$爜
+
+        WebResponseContent MESBoxCodeNotice(string boxCode);
+        /// <summary>
+        /// 鍒ゆ柇鍏佽鏀捐揣
+        /// </summary>
+        /// <returns></returns>
+        string MESAvgArriveNotice(RequestAGVArriveDTO requestAGVArriveDTO);
 
         /// <summary>
         /// 鍙犵洏鏈虹敵璇风┖鎵樺叆鎴愬搧搴�
@@ -134,6 +143,13 @@
         /// <param name="taskNum">浠诲姟鍙�</param>
         /// <returns></returns>
         WebResponseContent TaskCompleted(int taskNum);
+
+        /// <summary>
+        /// 浠诲姟閲嶆柊涓嬪彂
+        /// </summary>
+        /// <param name="taskNum">浠诲姟鍙�</param>
+        /// <returns></returns>
+        WebResponseContent ResendTask(int taskNum);
 
         /// <summary>
         /// 鏍规嵁璁惧缂栧彿銆佷换鍔$被鍨嬪垎缁�(鍙��)鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鏂板鐨勪换鍔�
@@ -202,6 +218,12 @@
         /// <returns></returns>
         WebResponseContent AgvSendTask(AgvTaskSendDTO taskModel, APIEnum SendTask = APIEnum.AgvSendTask);
         /// <summary>
+        /// AGV纭瀹屾垚鎺ュ彛(鍙栨斁)
+        /// </summary>
+        /// <param name="agvFinishDTO"></param>
+        /// <returns></returns>
+        WebResponseContent AGVFinish(AgvFinishDTO agvFinishDTO);
+        /// <summary>
         /// 瀹夊叏淇″彿鍥炲 WCS-AGV
         /// </summary>
         /// <param name="secureModel"></param>

--
Gitblit v1.9.3