From 5707781039b9d902ce1d2d6727fba65bbab14574 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 13 九月 2025 17:02:06 +0800
Subject: [PATCH] 异常单回滚
---
WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs | 94 ++++++-----------------------------------------
1 files changed, 12 insertions(+), 82 deletions(-)
diff --git a/WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs b/WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs
index 44e4de0..ec7c04f 100644
--- a/WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs
+++ b/WebApi/Gs.Warehouse/Services/VArrivalBarcodeManager.cs
@@ -115,7 +115,6 @@
m = dr.RowToDynamic();
m.list1 = dset.Tables[1].TableToDynamicList();
m.list2 = dset.Tables[2].TableToDynamicList();
- m.list3 = dset.Tables[3].TableToDynamicList();
}
}
catch (Exception ex)
@@ -125,68 +124,6 @@
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
"璇诲彇鎴愬姛锛�");
}
-
- /* /// <summary>
- /// 鍒犻櫎鏉＄爜
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<int?> DeleteBarcode([FromBody] dynamic model)
- {
- int? rtnInt = (int)ReturnCode.Default;
- string guidList = model.guidList;
- string aboutType = model.aboutType;
- string aboutGuid = model.aboutGuid;
- var _outMsg = "";
- var _outSum = -1;
- using (var conn = new SqlConnection(DbHelperSQL.strConn))
- {
- using (var cmd = new SqlCommand("[prc_barcode_del]", conn))
- {
- try
- {
- conn.Open();
- cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
- {
- new("@outMsg", SqlDbType.NVarChar, 300),
- new("@outSum", SqlDbType.Int),
- new("@inOrderGuid", aboutGuid),
- new("@inEdtUserGuid", _userGuid),
- new("@guidList", guidList),
- new("@aboutType", aboutType)
- };
- parameters[0].Direction = ParameterDirection.Output;
- parameters[1].Direction = ParameterDirection.Output;
- foreach (var parameter in parameters)
- cmd.Parameters.Add(parameter);
- cmd.ExecuteNonQuery();
- _outMsg = parameters[0].Value.ToString();
- _outSum = int.Parse(parameters[1].Value.ToString());
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(),
- "prc_barcode_del error锛�" + ex.Message);
- _outMsg = ex.Message;
- _outSum = -1;
- }
- finally
- {
- conn.Close();
- }
- }
- }
-
- if (_outSum <= 0)
- return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
- _outMsg);
- return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, _outMsg);
- }
- */
- /// <summary>
-
/// <summary>
/// 鍒犻櫎鏉＄爜
@@ -202,15 +139,9 @@
string aboutGuid = model.aboutGuid;
var _outMsg = "";
var _outSum = -1;
-
- // 鍒ゆ柇aboutGuid鏄惁涓烘湁鏁堢殑uniqueidentifier
- bool is_validGuid = Guid.TryParse(aboutGuid, out _);
- // 鏍规嵁楠岃瘉缁撴灉閫夋嫨瀵瑰簲鐨勫瓨鍌ㄨ繃绋�
- string storedProcedureName = is_validGuid ? "[prc_barcode_del]" : "[prc_barcode_del_hb]";
-
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- using (var cmd = new SqlCommand(storedProcedureName, conn))
+ using (var cmd = new SqlCommand("[prc_barcode_del]", conn))
{
try
{
@@ -218,13 +149,13 @@
cmd.CommandType = CommandType.StoredProcedure;
SqlParameter[] parameters =
{
- new("@outMsg", SqlDbType.NVarChar, 300),
- new("@outSum", SqlDbType.Int),
- new("@inOrderGuid", aboutGuid),
- new("@inEdtUserGuid", _userGuid),
- new("@guidList", guidList),
- new("@aboutType", aboutType)
- };
+ new("@outMsg", SqlDbType.NVarChar, 300),
+ new("@outSum", SqlDbType.Int),
+ new("@inOrderGuid", aboutGuid),
+ new("@inEdtUserGuid", _userGuid),
+ new("@guidList", guidList),
+ new("@aboutType", aboutType)
+ };
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
foreach (var parameter in parameters)
@@ -236,7 +167,7 @@
catch (Exception ex)
{
LogHelper.Debug(ToString(),
- $"{storedProcedureName} error锛歿ex.Message}");
+ "prc_barcode_del error锛�" + ex.Message);
_outMsg = ex.Message;
_outSum = -1;
}
@@ -253,8 +184,6 @@
return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, _outMsg);
}
-
-
/// <summary>
/// 閫夋嫨鏉＄爜
/// </summary>
@@ -269,6 +198,7 @@
string keyWhere = model.keyWhere;
string aboutGuid = model.aboutGuid;
string aboutType = model.aboutType;
+ string qcGuid = model.qcGuid;
var dset = new DataSet();
try
{
@@ -286,7 +216,8 @@
new("@inSortOrder", ""),
new("@inQueryWhere", keyWhere),
new("@inP1", aboutGuid),
- new("@inP2", aboutType)
+ new("@inP2", aboutType),
+ new("@inP3", qcGuid)
};
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
@@ -327,5 +258,4 @@
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
ReturnCode.Success, "璇诲彇鎴愬姛");
}
-
}
\ No newline at end of file
--
Gitblit v1.9.3