Merge branch 'xiaoyang' into dev

wanshenmean

13 小时以前 c9a1df9c19a64844d05d120ff171f523d77e7823

 Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockController.cs

@@ -72,7 +72,7 @@
        [HttpPost("SplitPalletConfirm"), AllowAnonymous]
        public async Task<WebResponseContent> SplitPalletConfirm([FromBody] SplitPalletConfirmRequestDto dto)
        {
            return await Service.SplitPalletConfirmAsync(dto.PalletCode);
            return await Service.SplitPalletConfirmAsync(dto.PalletCode, dto.DeviceName);
        }

        /// <summary>
@@ -83,7 +83,18 @@
        [HttpPost("GroupPalletConfirm"), AllowAnonymous]
        public async Task<WebResponseContent> GroupPalletConfirm([FromBody] GroupPalletConfirmRequestDto dto)
        {
            return await Service.GroupPalletConfirmAsync(dto.PalletCode);
            return await Service.GroupPalletConfirmAsync(dto.PalletCode, dto.DeviceName);
        }

        /// <summary>
        /// 根据托盘号查询库存明细数量
        /// </summary>
        /// <param name="palletCode">托盘号</param>
        /// <returns>库存明细数量</returns>
        [HttpGet("GetStockDetailCount"), AllowAnonymous]
        public async Task<WebResponseContent> GetStockDetailCount(string palletCode)
        {
            return await Service.GetStockDetailCountByPalletCodeAsync(palletCode);
        }
    }
}