test
9 小时以前 13eedb708b80ab8449f22e7581375841c26af2c4
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>
@@ -312,9 +326,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 +382,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
    }
}