From c9a1df9c19a64844d05d120ff171f523d77e7823 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期六, 25 四月 2026 22:15:36 +0800
Subject: [PATCH] Merge branch 'xiaoyang' into dev
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockController.cs | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockController.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockController.cs
index 2076b82..d6d062c 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockController.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockController.cs
@@ -72,7 +72,7 @@
[HttpPost("SplitPalletConfirm"), AllowAnonymous]
public async Task<WebResponseContent> SplitPalletConfirm([FromBody] SplitPalletConfirmRequestDto dto)
{
- return await Service.SplitPalletConfirmAsync(dto.PalletCode);
+ return await Service.SplitPalletConfirmAsync(dto.PalletCode, dto.DeviceName);
}
/// <summary>
@@ -83,7 +83,18 @@
[HttpPost("GroupPalletConfirm"), AllowAnonymous]
public async Task<WebResponseContent> GroupPalletConfirm([FromBody] GroupPalletConfirmRequestDto dto)
{
- return await Service.GroupPalletConfirmAsync(dto.PalletCode);
+ return await Service.GroupPalletConfirmAsync(dto.PalletCode, dto.DeviceName);
+ }
+
+ /// <summary>
+ /// 鏍规嵁鎵樼洏鍙锋煡璇㈠簱瀛樻槑缁嗘暟閲�
+ /// </summary>
+ /// <param name="palletCode">鎵樼洏鍙�</param>
+ /// <returns>搴撳瓨鏄庣粏鏁伴噺</returns>
+ [HttpGet("GetStockDetailCount"), AllowAnonymous]
+ public async Task<WebResponseContent> GetStockDetailCount(string palletCode)
+ {
+ return await Service.GetStockDetailCountByPalletCodeAsync(palletCode);
}
}
}
--
Gitblit v1.9.3