Merge branch 'master' into yyk

yyk

2024-08-22 1310b47a24f0cc70f0128c820bd490dca6a1a921

 Wms/Wms/Controllers/PdaAsnController.cs

@@ -583,7 +583,14 @@
                {
                    throw new Exception("未获取到用户信息");
                }
                _PdaAsnSvc.BindPalletNoPasteCode(model, int.Parse(UserId));
                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 = "绑定成功!" });