Merge branch 'master' into djp

test

4 天以前 e9c1fb1cae94c52d2a634f6e21a3a87354b52716

 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
@@ -261,10 +262,6 @@
        {
            await _pdaCrSvc.AgvTransport2(model.SoNo, model.PalletNo, model.AreaNo, _userManager.UserId);
        }

        #endregion

        #region AGV空托盘转运

        #endregion