From 57be7d35e105350c8828e6ab0a411a9f69f203a2 Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期一, 15 九月 2025 13:45:56 +0800
Subject: [PATCH] 修改PDA库存查询
---
Wms/Wms/Controllers/PdaCrController.cs | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 103 insertions(+), 5 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaCrController.cs b/Wms/Wms/Controllers/PdaCrController.cs
index 9a2d0d9..7634087 100644
--- a/Wms/Wms/Controllers/PdaCrController.cs
+++ b/Wms/Wms/Controllers/PdaCrController.cs
@@ -17,6 +17,7 @@
using System.Security.Cryptography;
using Wms.Tools;
using Microsoft.Extensions.Options;
+using Model.ModelDto.DataDto;
namespace Wms.Controllers
{
@@ -117,13 +118,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<DataStockDetail>> GetStockQueryList(string locatNo, string palletNo, string boxno)
{
- return await _pdaCrSvc.GetStockQueryList(locatNo, palletNo);
+ return await _pdaCrSvc.GetStockQueryList(locatNo, palletNo, boxno);
}
#endregion
@@ -238,6 +239,18 @@
await _pdaCrSvc.AgvTransport(model.PalletNo, model.AreaNo, model.Ruku, _config.WcsHost+ _config.IssueComApiUrl, _userManager.UserId);
}
/// <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杞繍鍛煎彨灏忚溅鍙栬揣
/// </summary>
/// <param name="model"></param>
@@ -312,9 +325,9 @@
}
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 = "", code = 0, msg = "鎴愬姛" });
+ return Ok(new { data = list, code = 0, msg = "鎴愬姛" });
}
catch (Exception e)
{
@@ -368,5 +381,90 @@
#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