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.QiTaRk/MesItemQtrkManager.cs | 40 ++++++++++++++++------------------------
1 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/WebApi/Gs.QiTaRk/MesItemQtrkManager.cs b/WebApi/Gs.QiTaRk/MesItemQtrkManager.cs
index bdc03fa..13e5ccf 100644
--- a/WebApi/Gs.QiTaRk/MesItemQtrkManager.cs
+++ b/WebApi/Gs.QiTaRk/MesItemQtrkManager.cs
@@ -18,7 +18,6 @@
private readonly IHttpContextAccessor _http;
private readonly string _userCode, _userGuid, _orgFids;
-
public MesItemQtrkManager(IHttpContextAccessor httpContextAccessor)
{
_http = httpContextAccessor;
@@ -82,9 +81,8 @@
{
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,
ReturnCode.Success, "璇诲彇鎴愬姛");
}
@@ -137,6 +135,7 @@
/// <summary>
+ ///
/// </summary>
/// <param name="mode"></param>
/// <returns></returns>
@@ -187,7 +186,6 @@
}
}
}
-
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
}
@@ -200,17 +198,17 @@
public ReturnDto<ExpandoObject> EditModel([FromBody] dynamic model)
{
Guid? guid = model.guid; //涓婚敭
- string kcZz = model.kcZz; //搴撳瓨缁勭粐
- string kcBm = model.kcBm; //搴撳瓨閮ㄩ棬
- string kcGys = model.kcGys; //搴撳瓨渚涘簲鍟�
- string kcCk = model.kcCk; //搴撳瓨浠撳簱
- string inRkyy = model.inRkyy; //鍏ュ簱鍘熷洜
- string djLx = model.djLx; //鍗曟嵁绫诲瀷
- string kcfx = model.kcfx; //搴撳瓨鏂瑰悜
- string hzlx = model.hzlx; //璐т富绫诲瀷
- string inHz = model.inHz; //璐т富缁勭粐
+ string kcZz = model.kcZz;//搴撳瓨缁勭粐
+ string kcBm = model.kcBm;//搴撳瓨閮ㄩ棬
+ string kcGys = model.kcGys;//搴撳瓨渚涘簲鍟�
+ string kcCk = model.kcCk;//搴撳瓨浠撳簱
+ string inRkyy = model.inRkyy;//鍏ュ簱鍘熷洜
+ string djLx = model.djLx;//鍗曟嵁绫诲瀷
+ string kcfx = model.kcfx;//搴撳瓨鏂瑰悜
+ string hzlx = model.hzlx;//璐т富绫诲瀷
+ string inHz = model.inHz;//璐т富缁勭粐
string inSource = model.inSource;
- string qtlx = model.qtlx; //鍚庢潵澧炲姞鐨勭被鍨�
+ string qtlx = model.qtlx;//鍚庢潵澧炲姞鐨勭被鍨�
var _sb = new StringBuilder();
var _split = "|";
foreach (var m in model.list)
@@ -226,7 +224,6 @@
_sb.Append("~");
_sb.Append(_line);
}
-
dynamic mObj = new ExpandoObject();
mObj.outMsg = "";
mObj.outSum = -1;
@@ -246,8 +243,7 @@
new("@outSum", SqlDbType.Int),
new("@outGuid", SqlDbType.UniqueIdentifier),
new("@outNo", SqlDbType.NVarChar, 300),
- new("@inOrderGuid",
- CheckGuid(guid) ? guid : DBNull.Value),
+ new("@inOrderGuid",CheckGuid(guid) ? guid : DBNull.Value),
new("@kcZz", kcZz),
new("@kcBm", kcBm),
new("@kcGys", kcGys),
@@ -260,7 +256,7 @@
new("@inEdtUserGuid", _userGuid),
new("@inLineList", _sb.ToString()),
new("@inSource", inSource),
- new("@qtlx", qtlx)
+ new("@qtlx", qtlx)
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -287,12 +283,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);
}
/// <summary>
@@ -348,7 +341,6 @@
}
}
}
-
if (_outSum <= 0)
return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
_outMsg);
--
Gitblit v1.9.3