From 1310b47a24f0cc70f0128c820bd490dca6a1a921 Mon Sep 17 00:00:00 2001
From: yyk <2336760928@qq.com>
Date: 星期四, 22 八月 2024 14:08:03 +0800
Subject: [PATCH] Merge branch 'master' into yyk
---
Wms/Wms/Controllers/PdaAsnController.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Wms/Wms/Controllers/PdaAsnController.cs b/Wms/Wms/Controllers/PdaAsnController.cs
index 1eb2b37..d896832 100644
--- a/Wms/Wms/Controllers/PdaAsnController.cs
+++ b/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
--
Gitblit v1.8.0