MES-WEB-API.git

			@@ -309,10 +309,10 @@
			{
			try
			{
			ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + HUserName + "'", "Xt_ModuleButtonSet");
			ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + HUserName + "' order by HOrder", "Xt_ModuleButtonSet");
			if (ds.Tables[0].Rows.Count == 0)
			{
			ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + "admin" + "'", "Xt_ModuleButtonSet");
			ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + "admin" + "' order by HOrder", "Xt_ModuleButtonSet");

			if (ds.Tables[0].Rows.Count != 0)
			{
			@@ -346,6 +346,7 @@
			public string BtnID;
			public string BtnName;
			public bool IsHide;
			public string HOtherName;
			}
			public class noEditList
			{
			@@ -356,6 +357,7 @@
			public int HOrder;
			public bool HHideFlag;
			public bool HEditFlag;
			public string HOtherName;
			}

			[Route("Xt_ModuleButtonSet_WMES/AddModuleButtonSetWMES")]
			@@ -417,6 +419,7 @@
			string HButtonID = HButtonIDLists[j].ToString();
			string HButtonName = HButtonNameLists[j].ToString();
			int HOrder = HOrderLists[j];
			string HOtherName = button[i].HOtherName;
			if (button[i].IsHide)
			{
			HHideFlag = 1;
			@@ -426,7 +429,7 @@
			HEditFlag = 0;
			HHideFlag = 0;
			}
			string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "'";
			string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "','" + HOtherName + "'";
			oCN.RunProc(sql);
			}
			}
			@@ -444,7 +447,8 @@
			string HButtonID = noEditLists[i].HButtonID;
			string HButtonName = noEditLists[i].HButtonName;
			int HOrder = HOrderLists[j];
			string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "'";
			string HOtherName = noEditLists[i].HOtherName;
			string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "','" + HOtherName + "'";
			oCN.RunProc(sql);
			}
			}
			@@ -706,5 +710,45 @@
			}
			}
			#endregion



			#region 基础资料获取数据
			[Route("Gy_GetBaseData/Gy_GetBaseData")]
			[HttpGet]
			public object Gy_GetBaseData(string sql,string tableView, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();


			ds = oCN.RunProcReturn(sql, tableView);

			//添加列名
			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;
			}
			}
			#endregion
			}
			}