From e9fa2cd033cc5399a4a23601f8155a8cd2079aab Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期日, 21 九月 2025 11:06:29 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
---
Wms/Wms/Controllers/PdaSoController.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index dca3e5d..61eb828 100644
--- a/Wms/Wms/Controllers/PdaSoController.cs
+++ b/Wms/Wms/Controllers/PdaSoController.cs
@@ -153,6 +153,27 @@
}
/// <summary>
+ /// 鍑哄簱鎷ｈ揣鑾峰彇鎵弿鏍囩鏁伴噺
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <param name="boxNo"></param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult CheckBoxForPick(string palletNo, string boxNo)
+ {
+ try
+ {
+ var boxNum = _pdaSoSvc.CheckBoxForPick(palletNo, boxNo);
+
+ return Ok(new { code = 0, msg = "鎷ｈ揣鏄庣粏淇℃伅", data = boxNum });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
+ /// <summary>
/// 鍑哄簱pda鎷ｈ揣
/// </summary>
/// <param name="model">SoDetailId:鍑哄簱鍗曟槑缁咺D銆丳alletNo:鎵樼洏鐮�</param>
@@ -160,7 +181,18 @@
[HttpPost]
public async Task SoSetPick(PdaSoVm model)
{
- await _pdaSoSvc.SoSetPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, _userManager.UserId);
+ //await _pdaSoSvc.SoSetPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, _userManager.UserId);
+ await _pdaSoSvc.SoSetPick34(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.PickQty, _userManager.UserId);
+ }
+ /// <summary>
+ /// 鎴愬搧鍑哄簱pda鎷ｈ揣-JC34
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task SoSetPickCode(PdaSoVm model)
+ {
+ await _pdaSoSvc.SoSetPickCode34(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNoList, _userManager.UserId);
}
/// <summary>
@@ -326,9 +358,31 @@
[HttpPost]
public async Task ChejianPick(PdaSoVm model)
{
+ if (_userManager.UserId == 0)
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+
await _pdaSoSvc.ChejianPick(model.PalletNo, model.BoxNo, _userManager.UserId);
}
+ /// <summary>
+ /// 杞﹂棿Pda鍑哄簱-鏁伴噺
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ [HttpPost]
+ public async Task ChejianPickNum(PdaSoVm model)
+ {
+ if (_userManager.UserId == 0)
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+
+ await _pdaSoSvc.ChejianPickNum(model, _userManager.UserId);
+ }
+
#endregion
#region JC23鐗堝彇鏍�
--
Gitblit v1.8.0