From 2f14ad3cc01d575bfde0850bae05fded8acb7af6 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 12 一月 2025 00:20:26 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs"
index 3a45629..edec038 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs"
@@ -7,6 +7,7 @@
 using WIDESEA_Core.BaseServices;
 using WIDESEA_DTO;
 using WIDESEA_DTO.Inbound;
+using WIDESEA_External.Model;
 using WIDESEA_IInboundRepository;
 using WIDESEA_Model.Models;
 
@@ -16,8 +17,19 @@
     {
         IInboundOrderRepository Repository { get; }
 
+        WebResponseContent GetInboundOrders(SaveModel saveModel);
         WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, string serNum);
 
-        WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, List<string> serNums);
+        WebResponseContent InPinKu(string inboundOrderId,int warehouseId, List<string> serNums);
+        WebResponseContent MaterielGroup(string palletCode, int Initiallife, int warehouseId, List<string> serNums);
+
+        //WebResponseContent FeedbackInboundOrder(int id);
+
+        WebResponseContent MaterielGroup(SaveModel saveModel);
+        /// <summary>
+        /// 鍏ュ簱瀹屾垚涓婃姤
+        /// </summary>
+        /// <returns></returns>
+        WebResponseContent FeedbackInboundOrder(Dt_StockInfo stockInfo,Dt_InboundOrder inboundOrder, List<ERPInboundDetailModel> detailModels);
     }
 }

--
Gitblit v1.9.3