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_TechnologyParameter", 1, false, user))
			{
			@@ -39,21 +41,85 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			string sql1 = string.Format(@"select * from h_v_Gy_TechnologyParameter where 1 =1 ");//where 组织名称='" + Organization + "'
			string sql1 = string.Format(@"select * from h_v_Gy_TechnologyParameterList where 1 =1 ");//where 组织名称='" + Organization + "'
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID ", "h_v_Gy_TechnologyParameter");
			ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID ", "h_v_Gy_TechnologyParameterList");
			}
			else
			{
			string sql = sql1 + sWhere + " order by HItemID";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_TechnologyParameter");
			ds = oCN.RunProcReturn(sql, "h_v_Gy_TechnologyParameterList");
			}

			//添加列名
			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)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			/// <summary>
			/// 返回工艺列表
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_TechnologyParameter/list1")]
			[HttpGet]
			public object list1(string sWhere, string user, string Organization)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_TechnologyParameter", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);

			string HEquipNumber = dic["HEquipNumber"].ToString();//设备
			string HProcName = dic["HProcName"].ToString();
			string HMaterName = dic["HMaterName"].ToString();

			ds = oCN.RunProcReturn("exec h_p_Gy_TechnologyParameterList '" + HEquipNumber + "','" + HProcName + "','" + HMaterName + "','" + 2 + "'", "h_p_Gy_TechnologyParameterList");


			//添加列名
			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)