Merge branch 'xiaoyang' into dev

wanshenmean

15 小时以前 c9a1df9c19a64844d05d120ff171f523d77e7823

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

@@ -26,7 +26,7 @@
        /// <param name="stock"></param>
        /// <returns></returns>
        [HttpGet,HttpPost,Route("GroupPalletAsync"), AllowAnonymous]
        public async Task<bool> GroupPallet([FromBody]StockDTO stock)
        public async Task<WebResponseContent> GroupPallet([FromBody]StockDTO stock)
        {
            return await Service.GroupPalletAsync(stock);
        }
@@ -37,7 +37,7 @@
        /// <param name="stock"></param>
        /// <returns></returns>
        [HttpGet, HttpPost, Route("ChangePalletAsync"),AllowAnonymous]
        public async Task<bool> ChangePalletAsync([FromBody] StockDTO stock)
        public async Task<WebResponseContent> ChangePalletAsync([FromBody] StockDTO stock)
        {
            return await Service.ChangePalletAsync(stock);
        }
@@ -48,7 +48,7 @@
        /// <param name="stock"></param>
        /// <returns></returns>
        [HttpGet, HttpPost, Route("SplitPalletAsync"), AllowAnonymous]
        public async Task<bool> SplitPalletAsync([FromBody] StockDTO stock)
        public async Task<WebResponseContent> SplitPalletAsync([FromBody] StockDTO stock)
        {
            return await Service.SplitPalletAsync(stock);
        }
@@ -63,5 +63,38 @@
        {
            return await Service.UpdateStockInfoAsync(stock);
        }

        /// <summary>
        /// 批量拆盘确认 - WCS拆盘任务全部取完时调用
        /// </summary>
        /// <param name="dto">拆盘确认请求</param>
        /// <returns>操作结果</returns>
        [HttpPost("SplitPalletConfirm"), AllowAnonymous]
        public async Task<WebResponseContent> SplitPalletConfirm([FromBody] SplitPalletConfirmRequestDto dto)
        {
            return await Service.SplitPalletConfirmAsync(dto.PalletCode, dto.DeviceName);
        }

        /// <summary>
        /// 批量组盘确认 - WCS组盘任务全部放完时调用
        /// </summary>
        /// <param name="dto">组盘确认请求</param>
        /// <returns>操作结果</returns>
        [HttpPost("GroupPalletConfirm"), AllowAnonymous]
        public async Task<WebResponseContent> GroupPalletConfirm([FromBody] GroupPalletConfirmRequestDto dto)
        {
            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);
        }
    }
}