From 0464969366317154fdbb51e106ca778b855bdd08 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 17 八月 2024 15:45:28 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Wms/Wms/Controllers/PdaAsnController.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaAsnController.cs b/Wms/Wms/Controllers/PdaAsnController.cs
index 2ae334d..d896832 100644
--- a/Wms/Wms/Controllers/PdaAsnController.cs
+++ b/Wms/Wms/Controllers/PdaAsnController.cs
@@ -573,8 +573,6 @@
[UnitOfWork]
public IActionResult BindPallet(PdaPalletBindVm model)
{
- try
- {
var claimsIdentity = this.User.Identity as ClaimsIdentity;
if (claimsIdentity == null)
{
@@ -585,15 +583,17 @@
{
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 = "缁戝畾鎴愬姛!" });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
}
#endregion
--
Gitblit v1.8.0