From dab0a583302f306d8c0ec37fbae37c9b4e37e473 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 29 十二月 2025 18:46:15 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/JiAnLiKu

---
 WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs
index 951dcb9..35d74d0 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using WIDESEA_Common;
+using WIDESEA_Common.TaskEnum;
 using WIDESEA_Core;
 using WIDESEA_Core.BaseServices;
 using WIDESEA_DTO.Inbound;
@@ -18,7 +19,10 @@
 
         WebResponseContent AddInboundOrders(HouseInbound orderAddDTO);
 
-        WebResponseContent MaterielGroup(MaterielGroupDTO materielGroupDTO);
+        //WebResponseContent MaterielGroup(MaterielGroupDTO materielGroupDTO);
+        WebResponseContent MaterielGroup(SaveModel saveModel);
+
+        WebResponseContent CPMaterielGroup(SaveModel saveModel);
 
         WebResponseContent QueryOrderInfo(int pageNo, string orderNo);
         WebResponseContent InventoryIn(string name);
@@ -26,5 +30,16 @@
         WebResponseContent CancelIn(HouseCancelIn houseCancelIn);
 
         Dt_InboundOrder GetInboundOrder(string InboundOrderNo);
+        WebResponseContent GetInboundOrders(SaveModel saveModel);
+
+        public WebResponseContent Save(AddInboundOrderModel addInboundOrder);
+
+        public WebResponseContent FeedbackInboundCanceERP(int[] keys);
+
+        public WebResponseContent ReceiveReturnOrder(List<HouseReturnOrder> houseReturnOrder);
+
+        public WebResponseContent GetMaterielCode(int warehouseId);
+
+        public WebResponseContent GetMaterielName(int warehouseId , string materielCode);
     }
 }

--
Gitblit v1.9.3