From a679c4a0a9aa216bf71cf0491699ef30655709b4 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-JIE70N9>
Date: 星期六, 20 九月 2025 14:50:16 +0800
Subject: [PATCH] 修改问题
---
Wms/Wms/Controllers/PdaCrController.cs | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaCrController.cs b/Wms/Wms/Controllers/PdaCrController.cs
index 7634087..130abd6 100644
--- a/Wms/Wms/Controllers/PdaCrController.cs
+++ b/Wms/Wms/Controllers/PdaCrController.cs
@@ -18,6 +18,8 @@
using Wms.Tools;
using Microsoft.Extensions.Options;
using Model.ModelDto.DataDto;
+using Model.ModelDto;
+using Model.ModelVm.BllSoVm;
namespace Wms.Controllers
{
@@ -122,7 +124,7 @@
/// <returns></returns>
[HttpGet]
[ServiceFilter(typeof(ApiResponseActionFilter))]
- public async Task<List<DataStockDetail>> GetStockQueryList(string locatNo, string palletNo, string boxno)
+ public async Task<List<StockDetailWithQtyDto>> GetStockQueryList(string locatNo, string palletNo, string boxno)
{
return await _pdaCrSvc.GetStockQueryList(locatNo, palletNo, boxno);
}
@@ -236,7 +238,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杞繍绌烘墭鐩�
--
Gitblit v1.8.0