Merge branch 'wxw'

wxw

2024-08-13 adb69643f9f8fef29f2f20f51ee8faff97583ad2

 Wms/Wms/Controllers/PdaAsnController.cs

@@ -6,6 +6,7 @@
using Model.ModelVm.PdaVm;
using System;
using System.Security.Claims;
using Utility;
using WMS.Entity.BllAsnEntity;
using WMS.IBLL.IPdaServer;

@@ -569,10 +570,9 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [UnitOfWork]
        public IActionResult BindPallet(PdaPalletBindVm model)
        {
            try
            {
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
@@ -583,15 +583,17 @@
                {
                    throw new Exception("未获取到用户信息");
                }
                _PdaAsnSvc.BindPalletStock(model, int.Parse(UserId), model.Origin);
                if (model.TableType == 0)
                {
                    _PdaAsnSvc.BindPalletPasteCode(model, int.Parse(UserId));
                }
                else if (model.TableType == 1)
                {
                    _PdaAsnSvc.BindPalletNoPasteCode(model, int.Parse(UserId));
                }

                return Ok(new { code = 0, msg = "绑定成功!" });

            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }
        #endregion