MES-WEB-API.git

			@@ -1,4 +1,5 @@
			using Newtonsoft.Json.Linq;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using Pub_Class;
			using System;
			using System.Collections;
			@@ -30,6 +31,7 @@
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_TechParamByProc", 1, false, user))
			{
			@@ -39,21 +41,30 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			string sql1 = string.Format(@"select * from h_v_Gy_TechParamByProc where 1 = 1");//where 组织名称='" + Organization + "'
			string sql1 = string.Format(@"select * from h_v_Gy_TechParamByProcList where 1 = 1");//where 组织名称='" + Organization + "'
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn(sql1 + sWhere + " order by HEntryID ", "h_v_Gy_TechParamByProc");
			ds = oCN.RunProcReturn(sql1 + sWhere + " order by 工艺参数代码 ", "h_v_Gy_TechParamByProcList");
			}
			else
			{
			string sql = sql1 + sWhere + " order by HEntryID";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_TechParamByProc");
			string sql = sql1 + sWhere + " order by 工艺参数代码";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_TechParamByProcList");
			}

			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)