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.QC/Service/IpqcShouManager.cs | 783 ++++++++++++++++++++++++++-----------------------------
1 files changed, 372 insertions(+), 411 deletions(-)
diff --git a/WebApi/GS.QC/Service/IpqcShouManager.cs b/WebApi/GS.QC/Service/IpqcShouManager.cs
index 5d642ec..225158f 100644
--- a/WebApi/GS.QC/Service/IpqcShouManager.cs
+++ b/WebApi/GS.QC/Service/IpqcShouManager.cs
@@ -1,8 +1,4 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using System.Dynamic;
-using System.Text;
-using Gs.Toolbox;
+锘縰sing Gs.Toolbox;
using Gs.Toolbox.ApiCore.Abstract.Mvc;
using Gs.Toolbox.ApiCore.Common.Mvc;
using Gs.Toolbox.ApiCore.Group;
@@ -10,37 +6,41 @@
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System.Data;
+using System.Data.SqlClient;
+using System.Dynamic;
+using System.Text;
using static Gs.Toolbox.UtilityHelper;
-namespace GS.QC.Service;
-
-[ApiGroup(ApiGroupNames.QC)]
-public class IpqcShouManager : IRomteService
+namespace GS.QC.Service
{
- private readonly IHttpContextAccessor _http;
- private readonly string _userCode, _userGuid, _orgFids;
-
- public IpqcShouManager(IHttpContextAccessor httpContextAccessor)
+ [ApiGroup(ApiGroupNames.QC)]
+ public class IpqcShouManager : IRomteService
{
- _http = httpContextAccessor;
- (_userCode, _userGuid, _orgFids) =
- GetUserGuidAndOrgGuid(_http);
- }
+ private readonly IHttpContextAccessor _http;
+ private readonly string _userCode, _userGuid, _orgFids;
- /// <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 =
+ public IpqcShouManager(IHttpContextAccessor httpContextAccessor)
{
+ _http = httpContextAccessor;
+ (_userCode, _userGuid, _orgFids) =
+ GetUserGuidAndOrgGuid(_http);
+ }
+
+ /// <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 =
+ {
new("@inCurrentPage", currentPage),
new("@inEveryPageSize", everyPageSize),
new("@inSortName", sortName),
@@ -52,427 +52,388 @@
new("@inP3", ""),
new("@inP4", "")
};
- var dset = new DataSet();
- var _pglist = new PageList<dynamic>
- {
- total = 0,
- everyPageSize = 0,
- pages = 0,
- list = new List<dynamic>()
- };
- try
- {
- dset = DbHelperSQL.RunProcedure("[ipqc_shou_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;
- }
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), ex.Message);
- return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
- ReturnCode.Exception, ex.Message);
- }
-
- 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 =
- {
- new("@inMainGuid", guid),
- new("@inP1", ""),
- new("@inP2", ""),
- new("@inP3", ""),
- new("@inP4", "")
- };
- var dset = new DataSet();
- try
- {
- dset = DbHelperSQL.RunProcedure("[ipqc_shou_get]", 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 _tb = dset.Tables[1].TableToDynamicList();
- m.list5 = _tb;
- }
- }
- 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, "璇诲彇澶辫触锛�");
- }
-
- /// <summary>
- /// 璇诲彇
- /// </summary>
- /// <param name="guid"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<ExpandoObject> GetModel12([FromBody] dynamic model)
- {
- Guid guid = model.guid;
- string parentGuid = model.parentGuid;
- dynamic m = new ExpandoObject();
- m.list = new List<dynamic>();
- m.list2 = new List<dynamic>();
- var sb = new StringBuilder();
- sb.Append(
- "select * from MES_QA_ITEMS_DETECT_DETAIL12 where parent_guid='" +
- guid + "' order by fstand asc");
- sb.Append(
- " select d13.*,d5.fcheck_item as fcheckItemd5,d5.ybsl from MES_QA_ITEMS_DETECT_DETAIL13 d13 left join[dbo].[MES_QA_ITEMS_DETECT_DETAIL5] d5 on d13.parent_guid = d5.guid");
- sb.Append(" where d13.parent_guid = '" + guid + "'");
- sb.Append(" order by d13.fcheck_item asc");
- try
- {
var dset = new DataSet();
- dset = DbHelperSQL.Query(sb.ToString());
- var _tb = dset.Tables[0].TableToDynamicList();
- m.list = _tb;
- var _tb2 = dset.Tables[1].TableToDynamicList();
- m.list2 = _tb2;
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), "GetModel12 error锛�" + ex.Message);
+ var _pglist = new PageList<dynamic>
+ {
+ total = 0,
+ everyPageSize = 0,
+ pages = 0,
+ list = new List<dynamic>()
+ };
+ try
+ {
+ dset = DbHelperSQL.RunProcedure("[ipqc_shou_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;
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(), ex.Message);
+ return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
+ ReturnCode.Exception, ex.Message);
+ }
+ return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
+ ReturnCode.Success, "璇诲彇鎴愬姛");
}
- if (m != null)
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
- "璇诲彇鎴愬姛锛�");
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
- "璇诲彇澶辫触锛�");
- }
-
- /// <summary>
- /// 璇诲彇web瀹炰綋
- /// </summary>
- /// <param name="guid"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<ExpandoObject> GetModelWeb([FromBody] dynamic model)
- {
- string guid = model.guid.ToString();
- dynamic m = new ExpandoObject();
- SqlParameter[] parameters =
+ /// <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 =
+ {
new("@inMainGuid", guid),
new("@inP1", ""),
new("@inP2", ""),
new("@inP3", ""),
new("@inP4", "")
};
- var dset = new DataSet();
- try
- {
- dset = DbHelperSQL.RunProcedure("[ipqc_shou_get_web]", parameters,
- "0");
- if (dset != null && dset.Tables.Count > 0 &&
- dset.Tables[0].Rows.Count > 0)
+ var dset = new DataSet();
+ try
{
- var dr = dset.Tables[0].Rows[0];
- m = dr.RowToDynamic();
- m.list = new List<dynamic>();
- var dtDistinct =
- new DataView(dset.Tables[1]).ToTable(true, "groupName");
- foreach (DataRow DataRow in dtDistinct.Rows)
+ dset = DbHelperSQL.RunProcedure("[ipqc_shou_get]", parameters, "0");
+ if (dset != null && dset.Tables.Count > 0 &&
+ dset.Tables[0].Rows.Count > 0)
{
- dynamic _obj = new ExpandoObject();
- _obj.groupName = DataRow["groupName"].ToString();
- _obj.child = new List<dynamic>();
- DataRow[] _dtRows = dset.Tables[1]
- .Select("groupName='" + _obj.groupName.ToString() +
- "'");
- if (_dtRows.Length == 0)
- continue;
- foreach (var _row in _dtRows)
+ var dr = dset.Tables[0].Rows[0];
+ m = dr.RowToDynamic();
+ var _tb = dset.Tables[1].TableToDynamicList();
+ m.list5 = _tb;
+ }
+ }
+ 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, "璇诲彇澶辫触锛�");
+ }
+
+ /// <summary>
+ /// 璇诲彇
+ /// </summary>
+ /// <param name="guid"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<ExpandoObject> GetModel12([FromBody] dynamic model)
+ {
+ Guid guid = model.guid;
+ string parentGuid = model.parentGuid;
+ dynamic m = new ExpandoObject();
+ m.list = new List<dynamic>();
+ m.list2 = new List<dynamic>();
+ StringBuilder sb = new StringBuilder();
+ sb.Append("select * from MES_QA_ITEMS_DETECT_DETAIL12 where parent_guid='" + guid + "' order by fstand asc");
+ sb.Append(" select d13.*,d5.fcheck_item as fcheckItemd5,d5.ybsl from MES_QA_ITEMS_DETECT_DETAIL13 d13 left join[dbo].[MES_QA_ITEMS_DETECT_DETAIL5] d5 on d13.parent_guid = d5.guid");
+ sb.Append(" where d13.parent_guid = '" + guid + "'");
+ sb.Append(" order by d13.fcheck_item asc");
+ try
+ {
+ DataSet dset = new DataSet();
+ dset = DbHelperSQL.Query(sb.ToString());
+ var _tb = dset.Tables[0].TableToDynamicList();
+ m.list = _tb;
+ var _tb2 = dset.Tables[1].TableToDynamicList();
+ m.list2 = _tb2;
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(), "GetModel12 error锛�" + ex.Message);
+ }
+ if (m != null)
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
+ "璇诲彇鎴愬姛锛�");
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
+ "璇诲彇澶辫触锛�");
+ }
+
+ /// <summary>
+ /// 璇诲彇web瀹炰綋
+ /// </summary>
+ /// <param name="guid"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<ExpandoObject> GetModelWeb([FromBody] dynamic model)
+ {
+ string guid = model.guid.ToString();
+ dynamic m = new ExpandoObject();
+ SqlParameter[] parameters =
+ {
+ new("@inMainGuid", guid),
+ new("@inP1", ""),
+ new("@inP2", ""),
+ new("@inP3", ""),
+ new("@inP4", "")
+ };
+ var dset = new DataSet();
+ try
+ {
+ dset = DbHelperSQL.RunProcedure("[ipqc_shou_get_web]", 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();
+ m.list = new List<dynamic>();
+ DataTable dtDistinct = (new DataView(dset.Tables[1])).ToTable(true, new string[] { "groupName" });
+ foreach (DataRow DataRow in dtDistinct.Rows)
{
- var _dy = _row.RowToDynamic();
- if (_obj.groupName.ToString() == "鍒剁儹鎬ц兘")
+ dynamic _obj = new System.Dynamic.ExpandoObject();
+ _obj.groupName = DataRow["groupName"].ToString();
+ _obj.child = new List<dynamic>();
+ DataRow[] _dtRows = dset.Tables[1].Select("groupName='" + _obj.groupName.ToString() + "'");
+ if (_dtRows.Length == 0)
+ continue;
+ foreach (DataRow _row in _dtRows)
{
- //姘存俯閫夋嫨
- if (!string.IsNullOrEmpty(_row["ipqc_zrxn_sel1"]
- .ToString()))
- _dy.selectedWater =
- JsonConvert.DeserializeObject(
- _row["ipqc_zrxn_sel1"].ToString());
- else
- _dy.selectedWater = Array.Empty<string>();
- //娴侀噺閫夋嫨
- if (!string.IsNullOrEmpty(_row["ipqc_zrxn_sel2"]
- .ToString()))
- _dy.selectedFlow =
- JsonConvert.DeserializeObject(
- _row["ipqc_zrxn_sel2"].ToString());
- else
- _dy.selectedFlow = Array.Empty<string>();
- //琛ㄦ牸鏁版嵁
- if (!string.IsNullOrEmpty(_row["ipqc_zrxn_table"]
- .ToString()))
- _dy.selecteTable =
- JsonConvert.DeserializeObject(
- _row["ipqc_zrxn_table"].ToString());
- else
- _dy.selecteTable = new { };
+ dynamic _dy = _row.RowToDynamic();
+ if (_obj.groupName.ToString() == "鍒剁儹鎬ц兘")
+ {
+ //姘存俯閫夋嫨
+ if (!string.IsNullOrEmpty(_row["ipqc_zrxn_sel1"].ToString()))
+ _dy.selectedWater = JsonConvert.DeserializeObject(_row["ipqc_zrxn_sel1"].ToString());
+ else
+ _dy.selectedWater = Array.Empty<string>();
+ //娴侀噺閫夋嫨
+ if (!string.IsNullOrEmpty(_row["ipqc_zrxn_sel2"].ToString()))
+ _dy.selectedFlow = JsonConvert.DeserializeObject(_row["ipqc_zrxn_sel2"].ToString());
+ else
+ _dy.selectedFlow = Array.Empty<string>();
+ //琛ㄦ牸鏁版嵁
+ if (!string.IsNullOrEmpty(_row["ipqc_zrxn_table"].ToString()))
+ _dy.selecteTable = JsonConvert.DeserializeObject(_row["ipqc_zrxn_table"].ToString());
+ else
+ _dy.selecteTable = new { };
+ }
+ _obj.child.Add(_dy);
}
-
- _obj.child.Add(_dy);
+ m.list.Add(_obj);
}
-
- m.list.Add(_obj);
}
}
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), ex.Message);
+ 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, "璇诲彇澶辫触锛�");
}
- 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<int?> SetModelWeb([FromBody] dynamic model)
- {
- string guid = model.guid;
- string strSql = model.strSql;
- string ziduan = model.ziduan;
- int? rtnInt = (int)ReturnCode.Default;
- try
+ /// <summary>
+ /// 璁剧疆
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<int?> SetModelWeb([FromBody] dynamic model)
{
- var sbSql = new StringBuilder();
- if (ziduan == "bpwym" || ziduan == "sjwym" || ziduan == "sjtxm")
- sbSql.Append("update dbo.MES_QA_ITEMS_DETECT_01 set " + strSql +
- " where guid='" + guid + "'");
+ string guid = model.guid;
+ string strSql = model.strSql;
+ string ziduan = model.ziduan;
+ int? rtnInt = (int)ReturnCode.Default;
+ try
+ {
+ System.Text.StringBuilder sbSql = new StringBuilder();
+ if (ziduan == "bpwym" || ziduan == "sjwym" || ziduan == "sjtxm")
+ sbSql.Append("update dbo.MES_QA_ITEMS_DETECT_01 set " + strSql + " where guid='" + guid + "'");
+ else
+ sbSql.Append("update dbo.MES_QA_ITEMS_DETECT_DETAIL5 set " + strSql + " where guid='" + guid + "'");
+ rtnInt = DbHelperSQL.ExecuteSql(sbSql.ToString());
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(this.ToString(), "SetModelWeb error锛�" + ex.Message);
+ rtnInt = (int)ReturnCode.Exception;
+ }
+ if (rtnInt > 0)
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success, "鎿嶄綔鎴愬姛!");
else
- sbSql.Append("update dbo.MES_QA_ITEMS_DETECT_DETAIL5 set " +
- strSql + " where guid='" + guid + "'");
- rtnInt = DbHelperSQL.ExecuteSql(sbSql.ToString());
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), "SetModelWeb error锛�" + ex.Message);
- rtnInt = (int)ReturnCode.Exception;
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鎿嶄綔澶辫触锛岃閲嶈瘯锛�");
}
- if (rtnInt > 0)
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success,
- "鎿嶄綔鎴愬姛!");
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception,
- "鎿嶄綔澶辫触锛岃閲嶈瘯锛�");
- }
-
- /// <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.submitType;
- dynamic m = new ExpandoObject();
- m.outSum = -1;
- m.outMsg = "";
- using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ /// <summary>
+ /// 鎻愪氦妫�楠�
+ /// </summary>
+ /// <param name="mode"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<ExpandoObject> EditModelSubmit([FromBody] dynamic mode)
{
- using (var cmd = new SqlCommand("ipqc_shou_submit", conn))
+ string _guid = mode.guid;
+ string _inFieldValue = mode.submitType;
+ dynamic m = new ExpandoObject();
+ m.outSum = -1;
+ m.outMsg = "";
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- try
+ using (var cmd = new SqlCommand("ipqc_shou_submit", conn))
{
- conn.Open();
- cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
+ try
{
- new("@outMsg", SqlDbType.NVarChar, 300),
- new("@outSum", SqlDbType.Int),
- new("@inEdtUserGuid", _userGuid),
- new("@inOrderGuid", _guid),
- new("@inFieldValue", _inFieldValue),
- new("@in1", ""),
- 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)
- {
- m.outMsg = ex.Message;
- LogHelper.Debug(ToString(),
- "ipqc_shou_submit error锛�" + ex.Message);
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
- ex.Message);
- }
- finally
- {
- conn.Close();
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@outMsg", SqlDbType.NVarChar, 300),
+ new("@outSum", SqlDbType.Int),
+ new("@inEdtUserGuid", _userGuid),
+ new("@inOrderGuid", _guid),
+ new("@inFieldValue", _inFieldValue),
+ new("@in1", ""),
+ 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)
+ {
+ m.outMsg = ex.Message;
+ LogHelper.Debug(this.ToString(), "ipqc_shou_submit error锛�" + ex.Message);
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, ex.Message);
+ }
+ finally
+ {
+ conn.Close();
+ }
}
}
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
}
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
- }
-
- /// <summary>
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<int?> UpdateTableConfig([FromBody] dynamic model)
- {
- string guid = model.guid;
- string mxguid = model.mxguid;
- JArray arrayWater = model.selectedWater;
- JArray arrayFlow = model.selectedFlow;
- JObject arrayTable = model.selectedTable;
- var selectedWater = arrayWater.ToString();
- var selectedFlow = arrayFlow.ToString();
- var tableData = new StringBuilder();
- tableData.Append("{");
- foreach (JValue jsonitem in arrayWater)
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<int?> UpdateTableConfig([FromBody] dynamic model)
{
- var jv = jsonitem.ToString().Trim();
- var _temp = arrayTable[jv]["temp"];
- if (tableData.Length > 2)
- tableData.Append(",");
- tableData.Append("'" + jv + "':");
+ string guid = model.guid;
+ string mxguid = model.mxguid;
+ JArray arrayWater = model.selectedWater;
+ JArray arrayFlow = model.selectedFlow;
+ JObject arrayTable = model.selectedTable;
+ string selectedWater = arrayWater.ToString();
+ string selectedFlow = arrayFlow.ToString();
+ System.Text.StringBuilder tableData = new StringBuilder();
tableData.Append("{");
- tableData.Append("'temp':'" + _temp + "'");
- foreach (JValue volume in arrayFlow)
+ foreach (JValue jsonitem in arrayWater)
{
- var _temp2 = arrayTable[jv][volume.ToString().Trim()];
- tableData.Append(",'" + volume.ToString().Trim() + "':'" +
- _temp2 + "'");
+ string jv = jsonitem.ToString().Trim();
+ var _temp = arrayTable[jv]["temp"];
+ if (tableData.Length > 2)
+ tableData.Append(",");
+ tableData.Append("'" + jv + "':");
+ tableData.Append("{");
+ tableData.Append("'temp':'" + _temp + "'");
+ foreach (JValue volume in arrayFlow)
+ {
+ var _temp2 = arrayTable[jv][volume.ToString().Trim()];
+ tableData.Append(",'" + volume.ToString().Trim() + "':'" + _temp2 + "'");
+ }
+ tableData.Append("}");
}
-
tableData.Append("}");
- }
-
- tableData.Append("}");
- int? rtnInt = (int)ReturnCode.Default;
- try
- {
- var sbSql = new StringBuilder();
- sbSql.Append(
- "UPDATE MES_QA_ITEMS_DETECT_DETAIL5 SET ipqc_zrxn_sel1 = @selectedWater,ipqc_zrxn_sel2 = @selectedFlow, ipqc_zrxn_table = @tableData WHERE guid = @mxguid");
- rtnInt = DbHelperSQL.ExecuteSql(sbSql.ToString(),
- new SqlParameter("@selectedWater", selectedWater),
- new SqlParameter("@selectedFlow", selectedFlow),
- new SqlParameter("@tableData", tableData.ToString()),
- new SqlParameter("@mxguid", mxguid));
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), "SetModelWeb error锛�" + ex.Message);
- rtnInt = (int)ReturnCode.Exception;
- }
-
- if (rtnInt > 0)
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success,
- "鎿嶄綔鎴愬姛!");
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception,
- "鎿嶄綔澶辫触锛岃閲嶈瘯锛�");
- }
-
- /// <summary>
- /// 璇诲彇
- /// </summary>
- /// <param name="guid"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<ExpandoObject> GetModelWebMx([FromBody] dynamic model)
- {
- string mxGuid = model.mxGuid.ToString();
- dynamic m = new ExpandoObject();
- var dset = new DataSet();
- try
- {
- var sbSql = new StringBuilder();
- sbSql.Append(
- "select * from [dbo].[MES_QA_ITEMS_DETECT_DETAIL5] where guid='" +
- mxGuid + "'");
- dset = DbHelperSQL.Query(sbSql.ToString());
- if (dset != null && dset.Tables.Count > 0 &&
- dset.Tables[0].Rows.Count > 0)
+ int? rtnInt = (int)ReturnCode.Default;
+ try
{
- var _row = dset.Tables[0].Rows[0];
- //姘存俯閫夋嫨
- if (!string.IsNullOrEmpty(_row["ipqc_zrxn_sel1"].ToString()))
- m.selectedWater =
- JsonConvert.DeserializeObject(_row["ipqc_zrxn_sel1"]
- .ToString());
- else
- m.selectedWater = Array.Empty<string>();
- //娴侀噺閫夋嫨
- if (!string.IsNullOrEmpty(_row["ipqc_zrxn_sel2"].ToString()))
- m.selectedFlow =
- JsonConvert.DeserializeObject(_row["ipqc_zrxn_sel2"]
- .ToString());
- else
- m.selectedFlow = Array.Empty<string>();
- //琛ㄦ牸鏁版嵁
- if (!string.IsNullOrEmpty(_row["ipqc_zrxn_table"].ToString()))
- m.selecteTable =
- JsonConvert.DeserializeObject(_row["ipqc_zrxn_table"]
- .ToString());
- else
- m.selecteTable = new { };
+ System.Text.StringBuilder sbSql = new StringBuilder();
+ sbSql.Append("UPDATE MES_QA_ITEMS_DETECT_DETAIL5 SET ipqc_zrxn_sel1 = @selectedWater,ipqc_zrxn_sel2 = @selectedFlow, ipqc_zrxn_table = @tableData WHERE guid = @mxguid");
+ rtnInt = Gs.Toolbox.DbHelperSQL.ExecuteSql(sbSql.ToString(), new SqlParameter[] {
+ new SqlParameter("@selectedWater", selectedWater),
+ new SqlParameter("@selectedFlow", selectedFlow),
+ new SqlParameter("@tableData", tableData.ToString()),
+ new SqlParameter("@mxguid", mxguid),
+ });
}
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), ex.Message);
+ catch (Exception ex)
+ {
+ LogHelper.Debug(this.ToString(), "SetModelWeb error锛�" + ex.Message);
+ rtnInt = (int)ReturnCode.Exception;
+ }
+ if (rtnInt > 0)
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success, "鎿嶄綔鎴愬姛!");
+ else
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鎿嶄綔澶辫触锛岃閲嶈瘯锛�");
}
- if (m != null)
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
- "璇诲彇鎴愬姛锛�");
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
+ /// <summary>
+ /// 璇诲彇
+ /// </summary>
+ /// <param name="guid"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<ExpandoObject> GetModelWebMx([FromBody] dynamic model)
+ {
+ string mxGuid = model.mxGuid.ToString();
+ dynamic m = new ExpandoObject();
+ var dset = new DataSet();
+ try
+ {
+ System.Text.StringBuilder sbSql = new StringBuilder();
+ sbSql.Append("select * from [dbo].[MES_QA_ITEMS_DETECT_DETAIL5] where guid='" + mxGuid + "'");
+ dset = DbHelperSQL.Query(sbSql.ToString());
+ if (dset != null && dset.Tables.Count > 0 &&
+ dset.Tables[0].Rows.Count > 0)
+ {
+ var _row = dset.Tables[0].Rows[0];
+ //姘存俯閫夋嫨
+ if (!string.IsNullOrEmpty(_row["ipqc_zrxn_sel1"].ToString()))
+ m.selectedWater = JsonConvert.DeserializeObject(_row["ipqc_zrxn_sel1"].ToString());
+ else
+ m.selectedWater = Array.Empty<string>();
+ //娴侀噺閫夋嫨
+ if (!string.IsNullOrEmpty(_row["ipqc_zrxn_sel2"].ToString()))
+ m.selectedFlow = JsonConvert.DeserializeObject(_row["ipqc_zrxn_sel2"].ToString());
+ else
+ m.selectedFlow = Array.Empty<string>();
+ //琛ㄦ牸鏁版嵁
+ if (!string.IsNullOrEmpty(_row["ipqc_zrxn_table"].ToString()))
+ m.selecteTable = JsonConvert.DeserializeObject(_row["ipqc_zrxn_table"].ToString());
+ else
+ m.selecteTable = new { };
+ }
+ }
+ 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, "璇诲彇澶辫触锛�");
+ }
+
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3