From ec3e4e46da50f911b9d3eaef98b399962f3e4c70 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 02 二月 2024 14:56:16 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/Wms/Controllers/PdaAsnController.cs | 65 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaAsnController.cs b/Wms/Wms/Controllers/PdaAsnController.cs
index f4dc254..1fd89c2 100644
--- a/Wms/Wms/Controllers/PdaAsnController.cs
+++ b/Wms/Wms/Controllers/PdaAsnController.cs
@@ -132,37 +132,6 @@
}
/// <summary>
- /// 缁戝畾鎵樼洏
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost]
- public IActionResult BindPallet(PdaPalletBindVm model)
- {
- try
- {
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
- string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(UserId))
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
- _PdaAsnSvc.BindPallet(model, int.Parse(UserId),model.Origin);
-
- return Ok(new { code = 0, msg = "缁戝畾鎴愬姛!" });
-
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
- }
-
- /// <summary>
/// 鍒犻櫎绠卞瓙淇℃伅
/// </summary>
/// <param name="model">Id锛氱瀛愪富閿�</param>
@@ -411,7 +380,7 @@
#endregion
- #region 鍘熸枡缁勬墭
+ #region 缁勬墭
/// <summary>
/// 鏍规嵁绠辩爜鑾峰彇鏍囩绠辩爜淇℃伅
/// </summary>
@@ -431,6 +400,38 @@
return Ok(new { code = 1, msg = e.Message });
}
}
+
+
+ /// <summary>
+ /// 缁戝畾鎵樼洏
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult BindPallet(PdaPalletBindVm model)
+ {
+ try
+ {
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+ string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(UserId))
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+ _PdaAsnSvc.BindPallet(model, int.Parse(UserId), model.Origin);
+
+ return Ok(new { code = 0, msg = "缁戝畾鎴愬姛!" });
+
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
#endregion
}
}
--
Gitblit v1.8.0