From d741e7a7ad7de5045e5c6b6145d9da1783cadecd Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 13 一月 2026 09:55:03 +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/TakeStockOrderController.cs | 13 +++++++++++--
1 files changed, 11 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/TakeStockOrderController.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/TakeStockOrderController.cs"
index 8bbacca..19033c5 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/TakeStockOrderController.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/TakeStockOrderController.cs"
@@ -76,9 +76,18 @@
/// 鏉傚彂鏉傛敹鍗曞鐞�
/// </summary>
[HttpPost, HttpGet, Route("DocumentReconciliation"), AllowAnonymous]
- public WebResponseContent DocumentReconciliation(int orderId,int id)
+ public WebResponseContent DocumentReconciliation(string barcode)
{
- return Service.DocumentReconciliation(orderId, id);
+ return Service.DocumentReconciliation(barcode);
+ }
+
+ /// <summary>
+ /// 鐩樼偣缁勭洏
+ /// </summary>
+ [HttpPost, HttpGet, Route("StockTakeGroupPallet"), AllowAnonymous]
+ public WebResponseContent StockTakeGroupPallet(string barcode, string boxNo)
+ {
+ return Service.StockTakeGroupPallet(barcode,boxNo);
}
}
}
--
Gitblit v1.9.3