From ce08db7fdb31a61c6ee672d89d6c4b4b66c1f6d6 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 16 一月 2025 14:41:51 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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 7969fb7..bc3971c 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"
@@ -20,15 +20,24 @@
         WebResponseContent GetInboundOrders(SaveModel saveModel);
         WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, string serNum);
 
+        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 FeedbackInboundOrder(int id);
 
         WebResponseContent MaterielGroup(SaveModel saveModel);
         /// <summary>
         /// 鍏ュ簱瀹屾垚涓婃姤
         /// </summary>
         /// <returns></returns>
-        WebResponseContent FeedbackInboundOrder(Dt_StockInfo stockInfo,Dt_InboundOrder inboundOrder, List<ERPInboundDetailModel> detailModels);
+        WebResponseContent FeedbackInboundOrder(Dt_InboundOrder inboundOrder);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="warehouse"></param>
+        /// <param name="palletCode"></param>
+        /// <param name="materielInfo"></param>
+        /// <returns></returns>
+        int GetPalletType(Dt_Warehouse warehouse, string palletCode);
     }
 }

--
Gitblit v1.9.3