Merge branch 'master' into Liudl

bklLiudl

2024-08-28 2bf4ac35e91c6a69bbaf43c79d6c5e96c3261288

 Wms/Wms/Controllers/BllAsnController.cs

@@ -22,8 +22,6 @@
    [Route("api/[controller]/[action]")]
    [ApiController]
    [Authorize]
    [ServiceFilter(typeof(ApiResponseActionFilter))]

    public class BllAsnController : ControllerBase
    {
        #region 依赖注入
@@ -337,7 +335,7 @@
        }
        #endregion

        #region 托盘绑定
        #region 组托收货
        [HttpPost]
        public IActionResult GetPalletBindList(PalletBindVm model)
        {
@@ -1271,6 +1269,7 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<SqlSugarPagedList> GetPalletUpShelfList(PalletUpShelfVm model)
        {
            RefAsync<int> count = new RefAsync<int>();