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

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 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 4e353d1..6b6894e 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"
@@ -30,6 +30,18 @@
         }
 
         /// <summary>
+        /// 鍏ュ钩搴�
+        /// </summary>
+        /// <param name="orderNo"></param>
+        /// <param name="warehouseId"></param>
+        /// <param name="serNums"></param>
+        /// <returns></returns>
+        [HttpPost, HttpGet, Route("InPinKu")]
+        public WebResponseContent InPinKu(string orderNo, int warehouseId, [FromBody] List<string> serNums)
+        {
+            return Service.InPinKu(orderNo, warehouseId, serNums);
+        }
+        /// <summary>
         /// 鍗曚釜鐗╂枡鐮佺粍鐩�
         /// </summary>
         /// <param name="inboundOrderId"></param>
@@ -70,11 +82,11 @@
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        [HttpPost, HttpGet, Route("FeedbackInboundOrder")]
-        public WebResponseContent FeedbackInboundOrder(int id)
-        {
-            return Service.FeedbackInboundOrder(id);
-        }
+        //[HttpPost, HttpGet, Route("FeedbackInboundOrder")]
+        //public WebResponseContent FeedbackInboundOrder(int id)
+        //{
+        //    return Service.FeedbackInboundOrder(id);
+        //}
 
         [HttpPost, HttpGet, Route("ManualMaterielGroup")]
         public WebResponseContent MaterielGroup(string palletCode, int initiallife, int warehouseId, [FromBody] List<string> serNums)

--
Gitblit v1.9.3