From 70b7d36733cd77434567e564888561ffb4c87c5e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 05 三月 2025 17:09:47 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutStockLockInfoService.cs |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutStockLockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutStockLockInfoService.cs"
index f34fe08..4d49688 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutStockLockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutStockLockInfoService.cs"
@@ -41,7 +41,7 @@
         Dt_OutStockLockInfo GetOutStockLockInfo(Dt_OutboundOrder outboundOrder, Dt_OutboundOrderDetail outboundOrderDetail, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null);
 
         /// <summary>
-        /// 
+        /// PP澶у嵎鍑哄簱
         /// </summary>
         /// <param name="mesOutboundOrder"></param>
         /// <param name="outStock"></param>
@@ -51,12 +51,38 @@
         Dt_OutStockLockInfo GetOutStockLockInfo(Dt_MesOutboundOrder mesOutboundOrder, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null);
 
         /// <summary>
+        /// PP灏忓嵎鍑哄簱
+        /// </summary>
+        /// <param name="mesOutboundOrder"></param>
+        /// <param name="outStock"></param>
+        /// <param name="assignQuantity"></param>
+        /// <param name="taskNum"></param>
+        /// <returns></returns>
+        List<Dt_OutStockLockInfo> GetOutStockLockInfos(Dt_MesPPCutOutboundOrder mesPPCutOutboundOrder,Dt_MesPPCutOutboundOrderDetail  mesPPCutOutboundOrderDetail, List<Dt_StockInfo> outStock, int? taskNum = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="mesOutboundOrder"></param>
+        /// <param name="outStock"></param>
+        /// <param name="assignQuantity"></param>
+        /// <param name="taskNum"></param>
+        /// <returns></returns>
+        Dt_OutStockLockInfo GetOutStockLockInfo(Dt_MesPPOutboundOrder mesPPOutboundOrder, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null);
+
+        /// <summary>
         /// 
         /// </summary>
         /// <param name="orderDetailId"></param>
         /// <param name="outStockStatus"></param>
         /// <returns></returns>
-        List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum outStockStatus);
+        List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum? outStockStatus);
+        /// <summary>
+        /// 鏍规嵁鍑哄簱鍗曞彿鑾峰彇鍑哄簱璇︽儏
+        /// </summary>
+        /// <param name="OrderNo"></param>
+        /// <returns></returns>
+        List<Dt_OutStockLockInfo> OutStockLockInfos(string OrderNo);
 
         /// <summary>
         /// 

--
Gitblit v1.9.3