From b71bb8ddf9dcf73d848195bf1f8ff8356d597088 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期三, 19 十一月 2025 08:11:51 +0800
Subject: [PATCH] 格式话代码
---
Wms/Wms/Controllers/PdaCrController.cs | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaCrController.cs b/Wms/Wms/Controllers/PdaCrController.cs
index ce952b6..0bdaacb 100644
--- a/Wms/Wms/Controllers/PdaCrController.cs
+++ b/Wms/Wms/Controllers/PdaCrController.cs
@@ -19,6 +19,7 @@
using Microsoft.Extensions.Options;
using Model.ModelDto.DataDto;
using Model.ModelDto;
+using Model.ModelVm.BllSoVm;
namespace Wms.Controllers
{
@@ -123,9 +124,17 @@
/// <returns></returns>
[HttpGet]
[ServiceFilter(typeof(ApiResponseActionFilter))]
- public async Task<List<StockDetailWithQtyDto>> GetStockQueryList(string locatNo, string palletNo, string boxno)
+ public IActionResult GetStockQueryList(string locatNo, string palletNo, string boxno)
{
- return await _pdaCrSvc.GetStockQueryList(locatNo, palletNo, boxno);
+ try
+ {
+ var list = _pdaCrSvc.GetStockQueryList(locatNo, palletNo, boxno);
+ return Ok(new { data = list, code = 0, msg = "鎴愬姛" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", code = 1, msg = $"寮傚父锛歿e.Message}" });
+ }
}
#endregion
@@ -237,7 +246,26 @@
[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杞繍绌烘墭鐩�
@@ -326,7 +354,7 @@
}
var uId = int.Parse(userId);
- var list = _pdaCrSvc.AddLableByDevanning(model.BoxNo, model.DevanQty,uId);
+ var list = _pdaCrSvc.AddLableByDevanning(model.BoxNo, model.DevanQty, uId);
return Ok(new { data = list, code = 0, msg = "鎴愬姛" });
}
@@ -394,7 +422,7 @@
public IActionResult GetBoxInfo(PdaUpPalletVm model)
{
try
- {
+ {
_pdaCrSvc.GetBoxInfo(model.BoxNo, model.PalletNo);
return Ok(new { data = "", code = 0, msg = "鎴愬姛" });
@@ -415,7 +443,7 @@
{
try
{
- _pdaCrSvc.UpPalletByBox(model.BoxNo, model.PalletNo,model.PalletNoNew,_userManager.UserId);
+ _pdaCrSvc.UpPalletByBox(model.BoxNo, model.PalletNo, model.PalletNoNew, _userManager.UserId);
return Ok(new { data = "", code = 0, msg = "鎴愬姛" });
}
@@ -455,7 +483,7 @@
{
try
{
- _pdaCrSvc.UpPalletByQty(model.PalletNo, model.PalletNoNew, model.DetailId,model.Qty, _userManager.UserId);
+ _pdaCrSvc.UpPalletByQty(model.PalletNo, model.PalletNoNew, model.DetailId, model.Qty, _userManager.UserId);
return Ok(new { data = "", code = 0, msg = "鎴愬姛" });
}
--
Gitblit v1.8.0