From c6babb9834248e2bc8fa6c037b3fb3e6ea4dc524 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 03 一月 2025 14:57:52 +0800
Subject: [PATCH] 更新代码

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
index 1b4e531..4e353d1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
@@ -9,6 +9,9 @@
 
 namespace WIDESEA_WMSServer.Controllers.Inbound
 {
+    /// <summary>
+    /// 鍏ュ簱鍗�
+    /// </summary>
     [Route("api/InboundOrder")]
     [ApiController]
     public class InboundOrderController : ApiBaseController<IInboundOrderService, Dt_InboundOrder>
@@ -46,10 +49,20 @@
         /// <param name="palletCode"></param>
         /// <param name="serNums"></param>
         /// <returns></returns>
+        //[HttpPost, HttpGet, Route("MaterielGroup")]
+        //public WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, List<string> serNums)
+        //{
+        //    return Service.MaterielGroup(inboundOrderId, palletCode, serNums);
+        //}
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="saveModel"></param>
+        /// <returns></returns>
         [HttpPost, HttpGet, Route("MaterielGroup")]
-        public WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, List<string> serNums)
+        public WebResponseContent MaterielGroup([FromBody] SaveModel saveModel)
         {
-            return Service.MaterielGroup(inboundOrderId, palletCode, serNums);
+            return Service.MaterielGroup(saveModel);
         }
 
         /// <summary>
@@ -62,5 +75,11 @@
         {
             return Service.FeedbackInboundOrder(id);
         }
+
+        [HttpPost, HttpGet, Route("ManualMaterielGroup")]
+        public WebResponseContent MaterielGroup(string palletCode, int initiallife, int warehouseId, [FromBody] List<string> serNums)
+        {
+            return Service.MaterielGroup(palletCode, initiallife, warehouseId, serNums);
+        }
     }
 }

--
Gitblit v1.9.3