From 237e6f81f655d3c24ca862fc210f9f3605d4b350 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 13 Jul 2023 15:40:33 +0800 Subject: [PATCH] 1 --- .../Tnb.WarehouseMgr/WmsSignForDeliveryService.cs | 6 ++++-- WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs index dd4dc423..41193639 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs @@ -132,17 +132,19 @@ namespace Tnb.WarehouseMgr [HttpPost] public async Task MESCarrySign(MESCarrySignInput input) { + var isSuccessFul = false; if (input.IsNull()) throw new ArgumentNullException("input"); var signInput = input.Adapt(); try { await SignForDelivery(signInput); + isSuccessFul = true; } catch (Exception) { - return ToApiResult(HttpStatusCode.InternalServerError, "签收失败"); + isSuccessFul= false; } - return ToApiResult(); + return isSuccessFul; } } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs index 9c873d78..b8bbb877 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs @@ -304,6 +304,7 @@ namespace Tnb.WarehouseMgr [HttpPost] public async Task MESKittingOutStk(List input) { + var isSuccessFul = false; if (input.IsNull()) throw new ArgumentNullException("input"); try { @@ -333,15 +334,18 @@ namespace Tnb.WarehouseMgr } await _db.Insertable(kittingOuts).ExecuteCommandAsync(); await _db.Insertable(kittingOutDs).ExecuteCommandAsync(); + await _db.Ado.CommitTranAsync(); + await KittingOutByAdd(); + isSuccessFul = true; } catch (Exception ex) { + isSuccessFul = false; await _db.Ado.RollbackTranAsync(); - return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message); } - await KittingOutByAdd(); - return ToApiResult(); + + return isSuccessFul; }