From ff006f77f6267fc0d2c4ee810d897a85165f5b8f Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期四, 30 四月 2026 22:08:29 +0800
Subject: [PATCH] Merge branch 'xiaoyang' into dev

---
 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/IRobotTaskService.cs |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 52 insertions(+), 1 deletions(-)

diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/IRobotTaskService.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/IRobotTaskService.cs
index af59c26..87d7b3a 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/IRobotTaskService.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/IRobotTaskService.cs
@@ -22,12 +22,13 @@
 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;
+using WIDESEAWCS_DTO.Stock;
 using WIDESEAWCS_DTO.TaskInfo;
 using WIDESEAWCS_Model.Models;
-using WIDESEAWCS_Common.TaskEnum;
 
 namespace WIDESEAWCS_ITaskInfoService
 {
@@ -53,9 +54,59 @@
         /// </summary>
         public List<int> TaskRobotTypes { get; }
 
+        public bool DeleteRobotTask(int id);
 
         public Dt_RobotTask? QueryRobotCraneTask(string deviceCode);
 
+        /// <summary>
+        /// 鏍规嵁璁惧缂栫爜鑾峰彇鎵ц涓殑鏈烘鎵嬩换鍔�
+        /// </summary>
+        /// <param name="deviceCode">璁惧缂栫爜</param>
+        /// <returns>鎵ц涓殑浠诲姟瀵硅薄锛屽鏋滄病鏈夊垯杩斿洖 null</returns>
+        public Dt_RobotTask? QueryRobotCraneExecutingTask(string deviceCode);
+
         Task<bool> UpdateRobotTaskAsync(Dt_RobotTask robotTask);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="taskDTO"></param>
+        /// <param name="stockDTO"></param>
+        /// <returns></returns>
+        WebResponseContent ReceiveWMSTask([NotNull] WMSTaskDTO taskDTO, StockDTO stockDTO);
+
+        /// <summary>
+        /// 璋冪敤WMS鎺ュ彛鑾峰彇鏈烘鎵嬩换鍔�
+        /// </summary>
+        /// <param name="task">鍑哄簱浠诲姟</param>
+        /// <returns>鎿嶄綔缁撴灉</returns>
+        WebResponseContent GetWMSRobotTask(Dt_Task task);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="taskType"></param>
+        /// <param name="palletCode"></param>
+        /// <returns></returns>
+        int GetRobotTaskTotalNum(int taskType, string? palletCode);
+
+        /// <summary>
+        /// 鍦ㄦ湰鍦扮洿鎺ュ垱寤烘満姊版墜浠诲姟锛屼笉璋冪敤WMS鎺ュ彛
+        /// </summary>
+        /// <param name="task">鍑哄簱浠诲姟</param>
+        /// <returns>鎿嶄綔缁撴灉</returns>
+        WebResponseContent CreateLocalRobotTask(Dt_Task task);
+
+        /// <summary>
+        /// 妫�鏌ユ簮绾夸綋鏄惁鏈夋墭鐩樺彿锛屽苟鏍规嵁缁撴灉鍒涘缓鏈烘鎵嬩换鍔°��
+        /// 鏈夋墭鐩樺彿鏃惰皟鐢� CreateLocalRobotTask锛屾棤鎵樼洏鍙锋椂浠� WMS 鑾峰彇浠诲姟銆�
+        /// </summary>
+        /// <param name="task">鍑哄簱浠诲姟瀹炰綋</param>
+        /// <returns>鎿嶄綔缁撴灉</returns>
+        WebResponseContent CheckSourceLineAndCreateRobotTask(Dt_Task task);
+
+        int MapWarehouseIdConfigKey(string? targetAddress);
+        string ResolveRobotRuleValue(string? targetAddress, string addressSectionName, string? fallback);
+        WebResponseContent CreateRobotTaskManually(ManualRobotTaskDto request);
     }
 }

--
Gitblit v1.9.3