~yxj/MES-WEB-API.git

			@@ -342,6 +342,122 @@
			}


			#region 用户设置
			#region 获取用户信息
			[Route("Gy_USERSet_PDA/GetGy_Czygl_Info")]
			[HttpGet]
			public object GetGy_Czygl_Info(string Czybm, string user)
			{
			try
			{
			//查看权限
			//if (!DBUtility.ClsPub.Security_Log("Gy_ProjectStage_Query", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无查看权限！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			string sql = @"select Czybm, Czymc, HWhID, HWhName, HSecManagerID, HSecManager, HKeeperID, HKeeper, HDeptID, HDept, HCloudUserName, HCloudUserPsd from Gy_Czygl where Czybm = '" + Czybm + "'";
			ds = oCN.RunProcReturn(sql, "Gy_Czygl");

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "未找到相关数据！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#region 保存用户信息
			[Route("Gy_USERSet_PDA/SaveGy_Czygl_Info")]
			[HttpPost]
			public object SaveGy_Czygl_Info([FromBody] JObject sMainSub)
			{
			try
			{
			//获取参数
			var _value = sMainSub["sMainSub"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);

			Int64 HWhID = Int64.Parse(sArray[0].ToString());
			string HWhName = sArray[1].ToString();
			Int64 HSecManagerID = Int64.Parse(sArray[2].ToString());
			string HSecManager = sArray[3].ToString();
			Int64 HKeeperID = Int64.Parse(sArray[4].ToString());
			string HKeeper = sArray[5].ToString();
			Int64 HDeptID = Int64.Parse(sArray[6].ToString());
			string HDept = sArray[7].ToString();
			string HCloudUserName = sArray[8].ToString().Trim();
			string HCloudUserPsd = sArray[9].ToString().Trim();

			string Czybm = sArray[10].ToString();
			string user = sArray[11].ToString(); //操作用户的用户名

			////判断是否有新增权限
			//if (!DBUtility.ClsPub.Security_Log("Sc_ICMOBillQualityStatus_Tmp_Edit", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无新增权限!";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			string sql = "update Gy_Czygl set " +
			"HWhID = " + HWhID +
			", HWhName = '" + HWhName +
			"', HSecManagerID = " + HSecManagerID +
			", HSecManager = '" + HSecManager +
			"', HKeeperID = " + HKeeperID +
			", HKeeper = '" + HKeeper +
			"', HDeptID = " + HDeptID +
			", HDept = '" + HDept +
			"', HCloudUserName = '" + HCloudUserName +
			"', HCloudUserPsd = '" + HCloudUserPsd +
			"' where Czybm = '" + Czybm + "'";

			oCN.RunProc(sql);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#endregion



			//撤销缓存列表记录
			[Route("Web/Rescind_Json")]
			@@ -2663,7 +2779,7 @@
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = "Select a.HItemID ,HNumber 核算方式组代码,HName 核算方式组名称,HDeptID,b.部门名称部门 from Gy_ClassTimePrjGroup a left join h_v_Gy_Department b on a.HDeptID=b.HItemID";
			string sql = "Select a.HItemID ,HNumber 核算方式组代码,HName 核算方式组名称,HDeptID,b.部门代码,b.部门名称部门 from Gy_ClassTimePrjGroup a left join h_v_Gy_Department b on a.HDeptID=b.HItemID";
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
			@@ -3410,7 +3526,7 @@
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
			objjson.Message = "获取失败" + ",没有查询到数据";
			objjson.data = null;
			return objjson;
			}
			@@ -3466,7 +3582,63 @@
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
			objjson.Message = "获取失败" + ",没有查询到数据";
			objjson.data = null;
			return objjson;
			}
			else
			{
			objjson.code = "1";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = ds.Tables[0];
			objjson.list = columnNameList;
			return objjson;
			}
			}
			catch (Exception ex)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ex.ToString();
			objjson.data = null;
			return objjson;
			}
			}

			/// <summary>
			/// 获取检仪器列表
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetGy_InspectInstruMent")]
			[HttpGet]
			public object GetGy_InspectInstruMent(string InspectInstruMent, int OrganizationID)
			{
			if (InspectInstruMent != "")
			{
			sWhere = " and ( 检验仪器代码 like '%" + InspectInstruMent + "%' or 检验仪器名称 like '%" + InspectInstruMent + "%' ) ";
			}
			try
			{
			List<object> columnNameList = new List<object>();

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = "Select * from h_v_Gy_InspectInstruMent where 1 = 1 " + sWhere + "Order by HItemID ";
			ds = oCN.RunProcReturn(sql, "h_v_Gy_InspectInstruMent");

			//添加列名
			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列对象的列名
			}

			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ",没有查询到数据";
			objjson.data = null;
			return objjson;
			}
			@@ -3509,7 +3681,7 @@
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = "select c.HItemID HQCCheckItemID,c.HName 检验项目,b.HQCStd,b.HQCUnit HUnit,b.HAnalysisMethod,b.HStatus HResult from Gy_QCCheckProjectMain a left join Gy_QCCheckProjectSub b on a.HInterID = b.HInterID left join Gy_QCCheckItem c on b.HQCCheckItemID = c.HItemID where a.HInterID = " + CheckProjectID;
			string sql = "select * from h_v_Gy_GetQCCheckItemByProject where hmainid = " + CheckProjectID;
			ds = oCN.RunProcReturn(sql, "Gy_QCCheckProjectMain");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{