From 696edbff3c8812e4b820f624d66a02ae6ddb1a06 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 16 四月 2026 13:40:18 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundController.cs |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundController.cs"
index c9a5249..b68593b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundController.cs"
@@ -41,14 +41,35 @@
         }
 
         /// <summary>
+        /// 鐩樼偣缁勭洏
+        /// </summary>
+        /// <param name="palletDto"></param>
+        /// <returns></returns>
+        [HttpPost, Route("StockTakeGroupPallet"), AllowAnonymous]
+        public async Task<WebResponseContent> StockTakeGroupPallet([FromBody] GroupPalletDto palletDto)
+        {
+            return await Service.StockTakeGroupPallet(palletDto);
+        }
+
+        /// <summary>
+        /// 閲嶆缁勭洏
+        /// </summary>
+        /// <param name="palletDto"></param>
+        /// <returns></returns>
+        [HttpPost, Route("ReCheckGroupPallet"), AllowAnonymous]
+        public async Task<WebResponseContent> ReCheckGroupPallet([FromBody] GroupPalletDto palletDto)
+        {
+            return await Service.ReCheckGroupPallet(palletDto);
+        }
+        /// <summary>
         /// 鍏ュ簱鍒嗘壒鍥炰紶MES
         /// </summary>
         /// <param name="palletDto"></param>
         /// <returns></returns>
         [HttpPost, Route("BatchInOrderFeedbackToMes"), AllowAnonymous]
-        public WebResponseContent BatchInOrderFeedbackToMes(string OrderNo)
+        public WebResponseContent BatchInOrderFeedbackToMes(int id)
         {
-            return Service.BatchInOrderFeedbackToMes(OrderNo);
+            return Service.BatchInOrderFeedbackToMes(id);
         }
     }
 }

--
Gitblit v1.9.3