From e561870f9644a5e80925346485fe623da678177f Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 14 十月 2025 10:20:57 +0800
Subject: [PATCH] 调整WMS出库逻辑，原辅料可选择成品库出库；
---
Wms/Wms/Controllers/PdaSoController.cs | 100 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 99 insertions(+), 1 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index 2d6283f..61eb828 100644
--- a/Wms/Wms/Controllers/PdaSoController.cs
+++ b/Wms/Wms/Controllers/PdaSoController.cs
@@ -81,6 +81,19 @@
return await _pdaSoSvc.GetSoSkuLotNoListBySo(model.SoNo);
}
+
+ /// <summary>
+ /// 鑾峰彇鐗╂枡-鎵规淇℃伅
+ /// </summary>
+ /// <param name="model">PalletNo:鎵樼洏鐮併�丼oNo:鍗曟嵁鍙�</param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<List<string>> GetPalletListBySo(PdaSoVm model)
+ {
+ return await _pdaSoSvc.GetPalletListBySo(model.SoNo,model.SoDetailId);
+ }
+
+
/// <summary>
/// 鑾峰彇鐗╂枡-鎵规淇℃伅
/// </summary>
@@ -140,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>
@@ -147,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>
@@ -161,6 +206,25 @@
await _pdaSoSvc.SoSetQtyPick(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, _userManager.UserId);
}
+ /// <summary>
+ /// 鏍规嵁绠辩爜鑾峰彇鏍囩绠辩爜淇℃伅锛堣溅闂村叆搴�-鑾峰彇WMS鐢熸垚鐨勭淇℃伅锛�
+ /// </summary>
+ /// <param name="boxNo">BoxNo:绠卞彿</param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetWmsBoxInfos(string boxNo)
+ {
+ try
+ {
+ var models = _pdaSoSvc.GetWmsBoxInfos(boxNo);
+
+ return Ok(new { code = 0, msg = "鏍囩绠辩爜淇℃伅", data = models });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
/// <summary>
/// 绌烘墭鍑哄簱
@@ -285,6 +349,40 @@
{
await _pdaSoSvc.SoSetQtyPinPick34(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, model.PalletNoNew, _userManager.UserId);
}
+
+ /// <summary>
+ /// 杞﹂棿pda鎷ｈ揣-鏍囩
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [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