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

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutStockLockInfoService.cs |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 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 55dbbd2..8132afb 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"
@@ -9,6 +9,7 @@
 using WIDESEA_Core.Enums;
 using WIDESEA_IOutboundRepository;
 using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.Outbound;
 
 namespace WIDESEA_IOutboundService
 {
@@ -41,7 +42,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,6 +52,26 @@
         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>
+        Dt_OutStockLockInfo GetOutStockLockInfo(Dt_MesPPCutOutboundOrder mesPPCutOutboundOrder,Dt_MesPPCutOutboundOrderDetail  mesPPCutOutboundOrderDetail, Dt_StockInfo outStock, float assignQuantity, 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>

--
Gitblit v1.9.3