From e1937ea7d68c72e61095538d5fec4e7d795f78c9 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 16 十月 2025 10:48:18 +0800
Subject: [PATCH] 修改物料管理显示和编辑
---
Wms/Wms/Controllers/PdaCrController.cs | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 169 insertions(+), 5 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaCrController.cs b/Wms/Wms/Controllers/PdaCrController.cs
index 9dea8fb..130abd6 100644
--- a/Wms/Wms/Controllers/PdaCrController.cs
+++ b/Wms/Wms/Controllers/PdaCrController.cs
@@ -17,6 +17,9 @@
using System.Security.Cryptography;
using Wms.Tools;
using Microsoft.Extensions.Options;
+using Model.ModelDto.DataDto;
+using Model.ModelDto;
+using Model.ModelVm.BllSoVm;
namespace Wms.Controllers
{
@@ -117,13 +120,13 @@
/// </summary>
/// <param name="locatNo">鍌ㄤ綅缂栧彿</param>
/// <param name="palletNo">鎵樼洏鍙�</param>
- /// <param name="skuName">鐗╂枡鍚嶇О</param>
+ /// <param name="boxno">绠辩爜</param>
/// <returns></returns>
[HttpGet]
[ServiceFilter(typeof(ApiResponseActionFilter))]
- public async Task<List<DataStockDetail>> GetStockQueryList(string locatNo, string palletNo)
+ public async Task<List<StockDetailWithQtyDto>> GetStockQueryList(string locatNo, string palletNo, string boxno)
{
- return await _pdaCrSvc.GetStockQueryList(locatNo, palletNo);
+ return await _pdaCrSvc.GetStockQueryList(locatNo, palletNo, boxno);
}
#endregion
@@ -235,7 +238,38 @@
[UnitOfWork]
public async Task AgvTransport(PdaAgvTransportVm model)
{
- await _pdaCrSvc.AgvTransport(model.PalletNo, model.AreaNo, model.Ruku, _config.WcsHost+ _config.IssueComApiUrl, _userManager.UserId);
+ await _pdaCrSvc.AgvTransport(model.PalletNo, model.AreaNo, model.LocatNoEnd, model.Ruku, _config.WcsHost + _config.IssueComApiUrl, _userManager.UserId);
+ }
+ /// <summary>
+ /// 鏍规嵁鍖哄煙鍙疯幏鍙栧偍浣嶅湴鍧�闆嗗悎
+ /// </summary>
+ /// <param name="areaNo"></param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetLocatByArea(string areaNo)
+ {
+ try
+ {
+ var _list = _pdaCrSvc.GetLocatByArea(areaNo);
+
+ return Ok(new { code = 0, count = 0, msg = "鑾峰彇鎴愬姛", data = _list });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+ /// <summary>
+ /// 鍛煎彨agv杞繍绌烘墭鐩�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ [UnitOfWork]
+ public async Task AgvNullPallet(PdaAgvTransportVm model)
+ {
+ await _pdaCrSvc.AgvNullPallet(model.PalletNo, model.AreaNo, model.LocatNo, _config.WcsHost + _config.IssueComApiUrl, _userManager.UserId);
}
/// <summary>
/// agv杞繍鍛煎彨灏忚溅鍙栬揣
@@ -312,7 +346,51 @@
}
var uId = int.Parse(userId);
- _pdaCrSvc.AddLableByDevanning(model.BoxNo, model.DevanQty,uId);
+ var list = _pdaCrSvc.AddLableByDevanning(model.BoxNo, model.DevanQty,uId);
+
+ return Ok(new { data = list, code = 0, msg = "鎴愬姛" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = $"寮傚父锛歿e.Message}" });
+ }
+ }
+ #endregion
+
+ #region 纭鏀惰揣
+
+ /// <summary>
+ /// 鏍规嵁鏀惰揣鎵樼洏鑾峰彇鍑哄簱鍗曚俊鎭�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult GetReceiptSoNoByPallet(PdaReceiptVm model)
+ {
+ try
+ {
+
+ var soNo = _pdaCrSvc.GetReceiptSoNoByPallet(model.PalletNo);
+
+ return Ok(new { data = soNo, code = 0, msg = "鎴愬姛" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = $"寮傚父锛歿e.Message}" });
+ }
+ }
+
+ /// <summary>
+ /// 纭鏀惰揣
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult ConfirmReceipt(PdaReceiptVm model)
+ {
+ try
+ {
+ _pdaCrSvc.ConfirmReceipt(model.PalletNo, _userManager.UserId);
return Ok(new { data = "", code = 0, msg = "鎴愬姛" });
}
@@ -321,6 +399,92 @@
return Ok(new { data = "", code = 1, msg = $"寮傚父锛歿e.Message}" });
}
}
+
+ #endregion
+
+
+ #region 鐗╂枡鎷嗘墭
+
+ /// <summary>
+ /// 鏌ヨ绠变俊鎭�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult GetBoxInfo(PdaUpPalletVm model)
+ {
+ try
+ {
+ _pdaCrSvc.GetBoxInfo(model.BoxNo, model.PalletNo);
+
+ return Ok(new { data = "", code = 0, msg = "鎴愬姛" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = $"寮傚父锛歿e.Message}" });
+ }
+ }
+
+ /// <summary>
+ /// 鐗╂枡鎷嗘墭
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult UpPalletByBox(PdaUpPalletVm model)
+ {
+ try
+ {
+ _pdaCrSvc.UpPalletByBox(model.BoxNo, model.PalletNo,model.PalletNoNew,_userManager.UserId);
+
+ return Ok(new { data = "", code = 0, msg = "鎴愬姛" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = $"寮傚父锛歿e.Message}" });
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁鎵樼洏鑾峰彇鎵樼洏涓婄殑鐗╂枡鎵规淇℃伅
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult GetSelectSkuLotNo(PdaUpPalletVm model)
+ {
+ try
+ {
+ var list = _pdaCrSvc.GetSelectSkuLotNo(model.PalletNo);
+
+ return Ok(new { data = list, code = 0, msg = "鎴愬姛" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = $"寮傚父锛歿e.Message}" });
+ }
+ }
+
+ /// <summary>
+ /// 鐗╂枡鎷嗘墭 - 鏁伴噺椤电
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult UpPalletByQty(PdaUpPalletVm model)
+ {
+ try
+ {
+ _pdaCrSvc.UpPalletByQty(model.PalletNo, model.PalletNoNew, model.DetailId,model.Qty, _userManager.UserId);
+
+ return Ok(new { data = "", code = 0, msg = "鎴愬姛" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = $"寮傚父锛歿e.Message}" });
+ }
+ }
+
#endregion
}
--
Gitblit v1.8.0