MES-WEB-API.git

			@@ -382,7 +382,7 @@
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sqlWhere == null \|\| sqlWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select 点检项目ID HDotCheckItemID,点检项目代码 as HDotCheckCode ,点检项目 HDotCheckItem,点检部位 HDotCheckPart ,具体要求 HClaim,表体备注 HRemark,负责人ID HManagerID,负责人编码 HManagerCode,负责人 HManagerName from h_v_Sb_EquipDotCheckBillList", "h_v_Sb_EquipDotCheckBillList");
			ds = oCN.RunProcReturn("select * from h_v_Sb_EquipDotCheckBill_Edit", "h_v_Sb_EquipDotCheckBill_Edit");
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			@@ -390,9 +390,9 @@
			}
			else
			{
			string sql1 = "select 点检项目ID HDotCheckItemID,点检项目代码 as HDotCheckCode ,点检项目 HDotCheckItem,点检部位 HDotCheckPart,具体要求 HClaim,表体备注 HRemark,负责人ID HManagerID,负责人编码 HManagerCode,负责人 HManagerName from h_v_Sb_EquipDotCheckBillList where 1 = 1 ";
			string sql1 = "select * from h_v_Sb_EquipDotCheckBill_Edit where 1 = 1 ";
			string sql = sql1 + sqlWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckBillList");
			ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckBill_Edit");
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			@@ -411,13 +411,8 @@
			#endregion





			#endregion


			#region 设备点检记录单PDA

			#region 根据设备条码查找设备档案信息PDA
			[Route("Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown")]
			@@ -752,7 +747,62 @@
			}
			#endregion

			#endregion
			#region 设备点检逾期预警报表

			[Route("Sb_EquipDotCheckWarning/Report")]
			[HttpGet]
			public object Report(string HYear,string HMonth,string HEquipTypeID, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//if (!DBUtility.ClsPub.Security_Log("Gy_EquipFileList", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "没有查看权限";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			if (HYear == null \|\| HYear.Equals("") \|\| HMonth == null \|\| HMonth.Equals(""))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "请选择有效年份，月份";
			objJsonResult.data = "";
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			else
			{
			string sql = "exec h_p_Sb_EquipDotCheckWarningReport " + HYear + "," + HMonth + "," + HEquipTypeID;
			ds = oCN.RunProcReturn(sql, "h_p_Sb_EquipDotCheckWarningReport");
			}

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