From b489f865bab00bedfce5e8f772095600b8034ac0 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 23 九月 2025 03:03:20 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
index bbc83dc..b844fc7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
@@ -28,6 +28,7 @@
 using WIDESEA_Core.BaseServices;
 using WIDESEA_Core.Enums;
 using WIDESEA_DTO;
+using WIDESEA_DTO.Basic;
 using WIDESEA_DTO.ERP;
 using WIDESEA_DTO.MES;
 using WIDESEA_DTO.Stock;
@@ -199,6 +200,12 @@
         /// <param name="locationCode"></param>
         /// <returns></returns>
         WebResponseContent IsRelocation(int taskNum, string locationCode);
+        /// <summary>
+        /// 鎵嬪姩绉诲簱
+        /// </summary>
+        /// <param name="relocationDTO"></param>
+        /// <returns></returns>
+        WebResponseContent ManualRelocation(RelocationDTO relocationDTO);
 
         /// <summary>
         /// 
@@ -343,6 +350,11 @@
         /// <returns></returns>
         WebResponseContent ShipmentOrderSync(MesShipmentOrderSync model);
         /// <summary>
+        /// WMS鍚屾鎴愬搧鍑哄簱鑷矼ES澶栧寘瑁呮満
+        /// </summary>
+        /// <returns></returns>
+        WebResponseContent ShipmentOrderMESSync(MesShipmentOrderSync model);
+        /// <summary>
         /// 鐢熸垚MESPP澶у嵎鍑哄簱浠诲姟
         /// </summary>
         /// <param name="keys"></param>
@@ -366,6 +378,7 @@
         /// <param name="StationCode">绔欏彴鍦板潃</param>
         /// <returns></returns>
         Task<WebResponseContent> OutProductTask(int[] keys, string StationCode, int Grade);
+        Task<WebResponseContent> OutProScrapTask(int[] keys, string StationCode, int Grade);
         /// <summary>
         /// 鎴愬搧浣欐枡閫�搴撳叆浠�
         /// </summary>
@@ -385,5 +398,12 @@
         /// </summary>
         WebResponseContent OutProductSelect(int orderDetailId, List<ProStockViewDTO> proStockViews);
         WebResponseContent GetZHMesMaterialLot(string materialLot);
+        /// <summary>
+        /// 浠诲姟鍙栨秷
+        /// </summary>
+        /// <param name="taskNum"></param>
+        /// <param name="warehouseId"></param>
+        /// <returns></returns>
+        public Task<WebResponseContent> TaskHandCancel(int taskNum);
     }
 }

--
Gitblit v1.9.3