From 6695afe1e1c478dbb599a1d382d8d6628b456d03 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 18 一月 2025 17:30:49 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs |   80 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 78 insertions(+), 2 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 07cc697..67606c7 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"
@@ -30,6 +30,7 @@
 using WIDESEA_DTO.ERP;
 using WIDESEA_DTO.MES;
 using WIDESEA_DTO.Stock;
+using WIDESEA_DTO.Task;
 using WIDESEA_ITaskInfoRepository;
 using WIDESEA_Model.Models;
 
@@ -76,7 +77,7 @@
         /// <param name="qty">鏁伴噺</param>
         /// <param name="address">鍦板潃</param>
         /// <returns></returns>
-        WebResponseContent OutEmpty(int qty, string address, int WarehouseId);
+        WebResponseContent OutEmpty(int qty, string address, int WarehouseId, string barcode);
 
         /// <summary>
         /// WCS鐢宠鍏ュ簱
@@ -88,6 +89,24 @@
         WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode);
 
         /// <summary>
+        /// 浠呯敵璇蜂换鍔★紝璁￤CS鏍规嵁璺敱纭畾涓嬩竴鍦板潃
+        /// </summary>
+        /// <param name="stationCode"></param>
+        /// <param name="palletCode"></param>
+        /// <returns></returns>
+        WebResponseContent DeviceRequestInboundTaskSimple(string stationCode, string palletCode);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="stationCode"></param>
+        /// <param name="palletCode"></param>
+        /// <param name="roadwayNos"></param>
+        /// <param name="heightType"></param>
+        /// <returns></returns>
+        WebResponseContent DeviceRequestInboundTaskByRoadways(string stationCode, string palletCode, List<string> roadwayNos, int heightType);
+
+        /// <summary>
         /// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅
         /// </summary>
         /// <param name="taskNum">浠诲姟鍙�</param>
@@ -95,6 +114,15 @@
         /// <param name="palletType">鎵樼洏绫诲瀷</param>
         /// <returns></returns>
         WebResponseContent AssignInboundTaskLocation(int taskNum, string roadwayNo);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="taskNum"></param>
+        /// <param name="roadwayNo"></param>
+        /// <param name="heightType"></param>
+        /// <returns></returns>
+        WebResponseContent AssignInboundTaskLocationByHeight(int taskNum, string roadwayNo, int heightType);
 
         /// <summary>
         /// 
@@ -129,7 +157,7 @@
         /// </summary>
         /// <param name="keys"></param>
         /// <returns></returns>
-        WebResponseContent GenerateOutboundTask(int[] keys);
+        WebResponseContent GenerateOutboundTasks(int[] keys);
 
         /// <summary>
         /// 鍑哄簱浠诲姟瀹屾垚
@@ -196,6 +224,54 @@
         /// <returns></returns>
         MesResponseContent SubstrateBack(SubstrateBackModel model);
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="roadwayNos"></param>
+        /// <param name="taskNum"></param>
+        /// <param name="heightType"></param>
+        /// <returns></returns>
+        WebResponseContent AssignRoadwayByHeight(List<string> roadwayNos, int taskNum, int heightType = 0);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="roadwayNos"></param>
+        /// <param name="palletCode"></param>
+        /// <param name="heightType"></param>
+        /// <returns></returns>
+        WebResponseContent AssignRoadwayByHeightAndCode(List<string> roadwayNos, string palletCode, int heightType = 0);
+
+        /// <summary>
+        /// 鍒嗛厤宸烽亾
+        /// </summary>
+        /// <param name="taskNum"></param>
+        /// <param name="roadwayNos"></param>
+        /// <returns></returns>
         WebResponseContent AssignRoadway(int taskNum, List<string> roadwayNos);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="roadwayNos"></param>
+        /// <returns></returns>
+        WebResponseContent SingleAssignRoadway(List<string> roadwayNos);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <returns></returns>
+        WebResponseContent HandSubstrateOut(int orderId);
+
+        /// <summary>
+        /// 淇敼浠诲姟鐘舵��
+        /// </summary>
+        /// <param name="task"></param>
+        /// <returns></returns>
+        WebResponseContent UpdateTaskInfo(WCSTaskDTO task);
+
+
+        WebResponseContent GeneratePKOutboundTask(int orderDetailId, List<StockSelectViewDTO> stockSelectViews);
     }
 }

--
Gitblit v1.9.3