From 2ba5117206c152cece2e5ac40067a6232dfb2870 Mon Sep 17 00:00:00 2001 From: 啊鑫 <t2856754968@163.com> Date: 星期三, 10 九月 2025 17:12:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs | 31 +++++++++++++------------------ 1 files changed, 13 insertions(+), 18 deletions(-) diff --git a/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs b/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs index 0bf6059..619199b 100644 --- a/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs +++ b/WebApi/Gs.Warehouse/Services/MesInvItemArnManager.cs @@ -31,6 +31,7 @@ } + #region CRUD /// <summary> @@ -88,7 +89,7 @@ { LogHelper.Debug(ToString(), ex.Message); return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist, - ReturnCode.Exception, ex.Message); + ReturnCode.Exception, ex.Message); } return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist, @@ -233,7 +234,6 @@ _sb.Append("~"); _sb.Append(_line); } - dynamic mObj = new ExpandoObject(); mObj.outMsg = ""; mObj.outSum = -1; @@ -290,12 +290,9 @@ } } } - if (mObj.outSum <= 0) - return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Exception, - mObj.outMsg); - return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Success, - mObj.outMsg); + return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Exception, mObj.outMsg); + return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Success, mObj.outMsg); } @@ -407,7 +404,6 @@ } } } - return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�"); } @@ -501,7 +497,7 @@ new("@inQueryWhere", keyWhere), new("@inBusType", inBusType), new("@inSupId", inSupId), - new("@inP1", inReceiveOrgId), //缁勭粐 + new("@inP1", inReceiveOrgId),//缁勭粐 new("@inP2", "") }; foreach (var parameter in parameters) @@ -512,7 +508,6 @@ dt.Fill(dset, "0"); } } - conn.Close(); } } @@ -610,6 +605,7 @@ "璇诲彇鎴愬姛锛�"); } + #endregion @@ -646,9 +642,9 @@ new("@inSortName", sortName), new("@inSortOrder", ""), new("@inQueryWhere", keyWhere), - new("@inBusType", inBusType), //1鏄噰璐紝2鏄澶� - new("@inSupId", inSupId), //渚涘簲鍟� - new("@inP1", inReceiveOrgId), //缁勭粐 + new("@inBusType", inBusType),//1鏄噰璐紝2鏄澶� + new("@inSupId", inSupId),//渚涘簲鍟� + new("@inP1", inReceiveOrgId),//缁勭粐 new("@inP2", "") }; foreach (var parameter in parameters) @@ -659,7 +655,6 @@ dt.Fill(dset, "0"); } } - conn.Close(); } } @@ -698,7 +693,7 @@ /// <summary> - /// 鏍规嵁鍗曞彿璇诲彇srm鏄庣粏 + /// 鏍规嵁鍗曞彿璇诲彇srm鏄庣粏 /// </summary> /// <param name="model"></param> /// <returns></returns> @@ -720,9 +715,9 @@ cmd.CommandType = CommandType.StoredProcedure; SqlParameter[] parameters = { - new("@pi_shdh", pi_shdh), - new("@inP1", ""), - new("@inP2", "") + new("@pi_shdh",pi_shdh), + new("@inP1",""), + new("@inP2",""), }; foreach (var parameter in parameters) cmd.Parameters.Add(parameter); -- Gitblit v1.9.3