From ae03ec7001b6ba415fa5ccac7c6ff06c81578eb1 Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期五, 19 九月 2025 08:02:38 +0800
Subject: [PATCH] Merge branch 'djp'
---
Wms/Wms/Controllers/PdaCrController.cs | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaCrController.cs b/Wms/Wms/Controllers/PdaCrController.cs
index fbd3020..ce952b6 100644
--- a/Wms/Wms/Controllers/PdaCrController.cs
+++ b/Wms/Wms/Controllers/PdaCrController.cs
@@ -17,6 +17,8 @@
using System.Security.Cryptography;
using Wms.Tools;
using Microsoft.Extensions.Options;
+using Model.ModelDto.DataDto;
+using Model.ModelDto;
namespace Wms.Controllers
{
@@ -117,13 +119,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
@@ -238,6 +240,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>
--
Gitblit v1.8.0