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/TakeStockOrderController.cs | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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..f733f08 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"
@@ -53,7 +53,6 @@
{
return Service.ReturnBox(orderNo, boxNo,sourceAddress);
}
-
/// <summary>
/// 浜哄伐骞宠处澶勭悊
/// </summary>
@@ -76,9 +75,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