Merge branch 'master' into Liudl

bklLiudl

19 小时以前 d3e81088f1afdc01b14af6bdac533116ab0cdb60

 Wms/Wms/Controllers/PdaSoController.cs

@@ -326,9 +326,31 @@
        [HttpPost]
        public async Task ChejianPick(PdaSoVm model)
        {
            if (_userManager.UserId == 0)
            {
                throw new Exception("未获取到用户信息");
            }

            await _pdaSoSvc.ChejianPick(model.PalletNo, model.BoxNo, _userManager.UserId);
        }

        /// <summary>
        /// 车间Pda出库-数量
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        [HttpPost]
        public async Task ChejianPickNum(PdaSoVm model) 
        {
            if (_userManager.UserId == 0)
            {
                throw new Exception("未获取到用户信息");
            }

            await _pdaSoSvc.ChejianPickNum(model, _userManager.UserId);
        }

        #endregion

        #region JC23版取样