From f2b71fe1d3c2b7651d525a5b5bbe66fad602ea06 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 09 九月 2025 18:46:28 +0800
Subject: [PATCH] 代码清理
---
WebApi/Gs.Warehouse/Services/MesAutoRkController.cs | 495 ++++++++++++++++++++++++++++--------------------------
1 files changed, 256 insertions(+), 239 deletions(-)
diff --git a/WebApi/Gs.Warehouse/Services/MesAutoRkController.cs b/WebApi/Gs.Warehouse/Services/MesAutoRkController.cs
index 0c0f480..78660fe 100644
--- a/WebApi/Gs.Warehouse/Services/MesAutoRkController.cs
+++ b/WebApi/Gs.Warehouse/Services/MesAutoRkController.cs
@@ -1,46 +1,44 @@
锘縰sing System.Data;
using System.Data.SqlClient;
using System.Dynamic;
-using System.Text;
using Gs.Toolbox;
using Gs.Toolbox.ApiCore.Abstract.Mvc;
using Gs.Toolbox.ApiCore.Common.Mvc;
using Gs.Toolbox.ApiCore.Group;
-using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json.Linq;
using static Gs.Toolbox.UtilityHelper;
-namespace Gs.Wom.WorkService
+namespace Gs.Wom.WorkService;
+
+[ApiGroup(ApiGroupNames.WOM)]
+public class MesAutoRkController : IRomteService
{
+ private readonly IHttpContextAccessor _http;
+ private readonly string _userCode, _userGuid, _orgFids;
- [ApiGroup(ApiGroupNames.WOM)]
- public class MesAutoRkController : IRomteService
+ public MesAutoRkController(IHttpContextAccessor httpContextAccessor)
{
- private readonly IHttpContextAccessor _http;
- private readonly string _userCode, _userGuid, _orgFids;
- public MesAutoRkController(IHttpContextAccessor httpContextAccessor)
- {
- _http = httpContextAccessor;
- (_userCode, _userGuid, _orgFids) = GetUserGuidAndOrgGuid(_http);
- }
+ _http = httpContextAccessor;
+ (_userCode, _userGuid, _orgFids) = GetUserGuidAndOrgGuid(_http);
+ }
- #region
- /// <summary>
- /// 璇诲彇鍒楄〃锛屾敮鎸佸垎椤�
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<PageList<dynamic>> GetListPage([FromBody] dynamic model)
+ #region
+
+ /// <summary>
+ /// 璇诲彇鍒楄〃锛屾敮鎸佸垎椤�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<PageList<dynamic>> GetListPage([FromBody] dynamic model)
+ {
+ int currentPage = model.currentPage;
+ int everyPageSize = model.everyPageSize;
+ string sortName = model.sortName;
+ string keyWhere = model.keyWhere;
+ SqlParameter[] parameters =
{
- int currentPage = model.currentPage;
- int everyPageSize = model.everyPageSize;
- string sortName = model.sortName;
- string keyWhere = model.keyWhere;
- SqlParameter[] parameters =
- {
new("@inCurrentPage", currentPage),
new("@inEveryPageSize", everyPageSize),
new("@inSortName", sortName),
@@ -52,178 +50,196 @@
new("@inP3", ""),
new("@inP4", "")
};
- var dset = new DataSet();
- var _pglist = new PageList<dynamic>
+ var dset = new DataSet();
+ var _pglist = new PageList<dynamic>
+ {
+ total = 0,
+ everyPageSize = 0,
+ pages = 0,
+ list = new List<dynamic>()
+ };
+ try
+ {
+ dset = DbHelperSQL.RunProcedure("prc_auto_rk_lst", parameters, "0");
+ if (dset != null && dset.Tables.Count > 0 &&
+ dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
{
- total = 0,
- everyPageSize = 0,
- pages = 0,
- list = new List<dynamic>()
- };
- try
- {
- dset = DbHelperSQL.RunProcedure("prc_auto_rk_lst", parameters, "0");
- if (dset != null && dset.Tables.Count > 0 &&
- dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
- {
- var intTotal =
- int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
- var pages = intTotal % everyPageSize != 0
- ? intTotal / everyPageSize + 1
- : intTotal / everyPageSize;
- _pglist.total = intTotal;
- _pglist.everyPageSize = everyPageSize;
- _pglist.pages = pages;
- var _dy = dset.Tables[0].TableToDynamicList();
- _pglist.list = _dy;
- }
+ var intTotal =
+ int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
+ var pages = intTotal % everyPageSize != 0
+ ? intTotal / everyPageSize + 1
+ : intTotal / everyPageSize;
+ _pglist.total = intTotal;
+ _pglist.everyPageSize = everyPageSize;
+ _pglist.pages = pages;
+ var _dy = dset.Tables[0].TableToDynamicList();
+ _pglist.list = _dy;
}
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), ex.Message);
- return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
- ReturnCode.Exception, ex.Message);
- }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(), ex.Message);
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
- ReturnCode.Success, "璇诲彇鎴愬姛");
+ ReturnCode.Exception, ex.Message);
}
- /// <summary>
- /// 璇诲彇
- /// </summary>
- /// <param name="guid"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<ExpandoObject> GetModel([FromBody] dynamic model)
+ return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
+ ReturnCode.Success, "璇诲彇鎴愬姛");
+ }
+
+ /// <summary>
+ /// 璇诲彇
+ /// </summary>
+ /// <param name="guid"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<ExpandoObject> GetModel([FromBody] dynamic model)
+ {
+ string guid = model.guid.ToString();
+ dynamic m = new ExpandoObject();
+ m.list = new List<dynamic>();
+ m.list2 = new List<dynamic>();
+ SqlParameter[] parameters =
{
- string guid = model.guid.ToString();
- dynamic m = new ExpandoObject();
- m.list = new List<dynamic>();
- m.list2 = new List<dynamic>();
- SqlParameter[] parameters =
- {
new("@inMainGuid", guid),
new("@inP1", ""),
new("@inP2", ""),
new("@inP3", ""),
new("@inP4", "")
};
- var dset = new DataSet();
- try
+ var dset = new DataSet();
+ try
+ {
+ dset = DbHelperSQL.RunProcedure("[prc_auto_rk_mx]", parameters,
+ "0");
+ if (dset != null && dset.Tables.Count > 0 &&
+ dset.Tables[0].Rows.Count > 0)
{
- dset = DbHelperSQL.RunProcedure("[prc_auto_rk_mx]", parameters, "0");
- if (dset != null && dset.Tables.Count > 0 &&
- dset.Tables[0].Rows.Count > 0)
- {
- var dr = dset.Tables[0].Rows[0];
- m = dr.RowToDynamic();
- }
+ var dr = dset.Tables[0].Rows[0];
+ m = dr.RowToDynamic();
}
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), ex.Message);
- }
-
- if (m != null)
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
- "璇诲彇鎴愬姛锛�");
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(), ex.Message);
}
- /// <summary>
- /// 澧炲姞鎴栫紪杈戝疄浣�
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<ExpandoObject> EditModel([FromBody] dynamic model)
+ if (m != null)
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
+ "璇诲彇鎴愬姛锛�");
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
+ }
+
+ /// <summary>
+ /// 澧炲姞鎴栫紪杈戝疄浣�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<ExpandoObject> EditModel([FromBody] dynamic model)
+ {
+ Guid? guid = model.guid; //涓婚敭
+ string itemId = model.itemId;
+ string departmentId = model.departmentId;
+ string depotId = model.depotId;
+ string depotlocid = model.depotlocid;
+ dynamic mObj = new ExpandoObject();
+ mObj.outMsg = "";
+ mObj.outSum = -1;
+ mObj.outGuid = "";
+ mObj.outNo = "";
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- Guid? guid = model.guid; //涓婚敭
- string itemId = model.itemId;
- string departmentId = model.departmentId;
- string depotId = model.depotId;
- string depotlocid = model.depotlocid;
- dynamic mObj = new ExpandoObject();
- mObj.outMsg = "";
- mObj.outSum = -1;
- mObj.outGuid = "";
- mObj.outNo = "";
- using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ using (var cmd = new SqlCommand("[prc_auto_rk_edt]", conn))
{
- using (var cmd = new SqlCommand("[prc_auto_rk_edt]", conn))
+ try
{
- try
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
{
- conn.Open();
- cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
- {
- new SqlParameter("@outMsg", SqlDbType.NVarChar, 300),
- new SqlParameter("@outSum", SqlDbType.Int),
- new SqlParameter("@outGuid", SqlDbType.UniqueIdentifier),
- new SqlParameter("@outNo", SqlDbType.NVarChar, 300),
- new SqlParameter("@inOrderGuid", CheckGuid(guid) ? guid : DBNull.Value),
- new SqlParameter("@ItemId", string.IsNullOrEmpty(itemId) ? DBNull.Value : (object)long.Parse(itemId)),
- new SqlParameter("@departmentId", string.IsNullOrEmpty(departmentId) ? DBNull.Value : (object)long.Parse(departmentId)),
- new SqlParameter("@depotId", string.IsNullOrEmpty(depotId) ? DBNull.Value : (object)long.Parse(depotId)),
- new SqlParameter("@depotlocid", string.IsNullOrEmpty(depotlocid) ? DBNull.Value : (object)depotlocid),
- new SqlParameter("@remark", ""),
- new SqlParameter("@inEdtUserGuid", _userGuid),
- new SqlParameter("@inLineList", DBNull.Value), // 璁剧疆涓篋BNull.Value
- new SqlParameter("@inLineList2", DBNull.Value) // 璁剧疆涓篋BNull.Value
+ new("@outMsg", SqlDbType.NVarChar, 300),
+ new("@outSum", SqlDbType.Int),
+ new("@outGuid", SqlDbType.UniqueIdentifier),
+ new("@outNo", SqlDbType.NVarChar, 300),
+ new("@inOrderGuid",
+ CheckGuid(guid) ? guid : DBNull.Value),
+ new("@ItemId",
+ string.IsNullOrEmpty(itemId)
+ ? DBNull.Value
+ : long.Parse(itemId)),
+ new("@departmentId",
+ string.IsNullOrEmpty(departmentId)
+ ? DBNull.Value
+ : long.Parse(departmentId)),
+ new("@depotId",
+ string.IsNullOrEmpty(depotId)
+ ? DBNull.Value
+ : long.Parse(depotId)),
+ new("@depotlocid",
+ string.IsNullOrEmpty(depotlocid)
+ ? DBNull.Value
+ : depotlocid),
+ new("@remark", ""),
+ new("@inEdtUserGuid", _userGuid),
+ new("@inLineList", DBNull.Value), // 璁剧疆涓篋BNull.Value
+ new("@inLineList2", DBNull.Value) // 璁剧疆涓篋BNull.Value
};
- parameters[0].Direction = ParameterDirection.Output;
- parameters[1].Direction = ParameterDirection.Output;
- parameters[2].Direction = ParameterDirection.Output;
- parameters[3].Direction = ParameterDirection.Output;
- foreach (var parameter in parameters)
- cmd.Parameters.Add(parameter);
- cmd.ExecuteNonQuery();
- mObj.outMsg = parameters[0].Value.ToString();
- mObj.outSum = int.Parse(parameters[1].Value.ToString());
- mObj.outGuid = parameters[2].Value.ToString();
- mObj.outNo = parameters[3].Value.ToString();
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(),
- "prc_item_tbl_edt error锛�" + ex.Message);
- mObj.outMsg = ex.Message;
- mObj.outSum = -1;
- }
- finally
- {
- conn.Close();
- }
+ parameters[0].Direction = ParameterDirection.Output;
+ parameters[1].Direction = ParameterDirection.Output;
+ parameters[2].Direction = ParameterDirection.Output;
+ parameters[3].Direction = ParameterDirection.Output;
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ cmd.ExecuteNonQuery();
+ mObj.outMsg = parameters[0].Value.ToString();
+ mObj.outSum = int.Parse(parameters[1].Value.ToString());
+ mObj.outGuid = parameters[2].Value.ToString();
+ mObj.outNo = parameters[3].Value.ToString();
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(),
+ "prc_item_tbl_edt error锛�" + ex.Message);
+ mObj.outMsg = ex.Message;
+ mObj.outSum = -1;
+ }
+ finally
+ {
+ conn.Close();
}
}
- if (mObj.outSum <= 0)
- return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Exception, mObj.outMsg);
- return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Success, mObj.outMsg);
}
- /// <summary>
- /// 鍒犻櫎涓昏〃鎴栨槑缁�
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<int?> DeleteModel([FromBody] dynamic model)
+ if (mObj.outSum <= 0)
+ return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Exception,
+ mObj.outMsg);
+ return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Success,
+ mObj.outMsg);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎涓昏〃鎴栨槑缁�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<int?> DeleteModel([FromBody] dynamic model)
+ {
+ int? rtnInt = (int)ReturnCode.Default;
+ Guid? guid = model.guid; //鍒拌揣鍗曚富閿�
+ var _outMsg = "";
+ var _outSum = -1;
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- int? rtnInt = (int)ReturnCode.Default;
- Guid? guid = model.guid; //鍒拌揣鍗曚富閿�
- var _outMsg = "";
- var _outSum = -1;
- using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ using (var cmd = new SqlCommand("[prc_auto_rk_del]", conn))
{
- using (var cmd = new SqlCommand("[prc_auto_rk_del]", conn))
+ try
{
- try
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
{
- conn.Open();
- cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
- {
new("@outMsg", SqlDbType.NVarChar, 300),
new("@outSum", SqlDbType.Int),
new("@inOrderGuid",
@@ -232,62 +248,62 @@
: DBNull.Value),
new("@inEdtUserGuid", _userGuid)
};
- parameters[0].Direction = ParameterDirection.Output;
- parameters[1].Direction = ParameterDirection.Output;
- foreach (var parameter in parameters)
- cmd.Parameters.Add(parameter);
+ 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_auto_rk_del error锛�" + ex.Message);
- _outMsg = ex.Message;
- _outSum = -1;
- }
- finally
- {
- conn.Close();
- }
+ cmd.ExecuteNonQuery();
+ _outMsg = parameters[0].Value.ToString();
+ _outSum = int.Parse(parameters[1].Value.ToString());
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(),
+ "prc_auto_rk_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);
}
+ if (_outSum <= 0)
+ return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
+ _outMsg);
+ return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, _outMsg);
+ }
- /// <summary>
- /// 鎻愪氦妫�楠�
- /// </summary>
- /// <param name="mode"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<ExpandoObject> EditModelSubmit([FromBody] dynamic mode)
+
+ /// <summary>
+ /// 鎻愪氦妫�楠�
+ /// </summary>
+ /// <param name="mode"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<ExpandoObject> EditModelSubmit([FromBody] dynamic mode)
+ {
+ string _guid = mode.guid;
+ string _inFieldValue = mode.inFieldValue;
+ string _chkOut = mode.chkOut;
+ var _proName = "prc_auto_rk_submit";
+ dynamic m = new ExpandoObject();
+ m.outSum = -1;
+ m.outMsg = "";
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- string _guid = mode.guid;
- string _inFieldValue = mode.inFieldValue;
- string _chkOut = mode.chkOut;
- string _proName = "prc_auto_rk_submit";
- dynamic m = new ExpandoObject();
- m.outSum = -1;
- m.outMsg = "";
- using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ using (var cmd = new SqlCommand(_proName, conn))
{
- using (var cmd = new SqlCommand(_proName, conn))
+ try
{
- try
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
{
- conn.Open();
- cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
- {
- new("@outMsg", SqlDbType.NVarChar, 2500),
+ new("@outMsg", SqlDbType.NVarChar, 2500),
new("@outSum", SqlDbType.Int),
new("@inEdtUserGuid", _userGuid),
new("@inOrderGuid", _guid),
@@ -295,30 +311,31 @@
new("@in1", _chkOut),
new("@in2", "")
};
- parameters[0].Direction = ParameterDirection.Output;
- parameters[1].Direction = ParameterDirection.Output;
- foreach (var parameter in parameters)
- cmd.Parameters.Add(parameter);
- cmd.ExecuteNonQuery();
- m.outMsg = parameters[0].Value.ToString();
- m.outSum = int.Parse(parameters[1].Value.ToString());
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(),
- "prc_auto_rk_submit error锛�" + ex.Message);
- m.outMsg = ex.Message;
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
- ex.Message);
- }
- finally
- {
- conn.Close();
- }
+ parameters[0].Direction = ParameterDirection.Output;
+ parameters[1].Direction = ParameterDirection.Output;
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ cmd.ExecuteNonQuery();
+ m.outMsg = parameters[0].Value.ToString();
+ m.outSum = int.Parse(parameters[1].Value.ToString());
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(),
+ "prc_auto_rk_submit error锛�" + ex.Message);
+ m.outMsg = ex.Message;
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
+ ex.Message);
+ }
+ finally
+ {
+ conn.Close();
}
}
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
}
- #endregion
+
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
}
-}
+
+ #endregion
+}
\ No newline at end of file
--
Gitblit v1.9.3