~yxj/MES-WEB-API.git

			@@ -1,4 +1,5 @@
			using DBUtility;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using System;
			using System.Collections.Generic;
			@@ -28,8 +29,9 @@
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//编辑权限
			//if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBillList", 1, true, user))
			//if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBillList", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			@@ -39,22 +41,32 @@
			//}

			ds = Get_GG_NoticeBillList(sWhere);
			if (ds == null)

			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查询数据异常，请与管理员联系！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "返回记录成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}

			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			//}
			//else
			//{
			//objJsonResult.code = "0";
			//objJsonResult.count = 0;
			//objJsonResult.Message = "无数据";
			//objJsonResult.data = null;
			//return objJsonResult;
			//}
			}
			catch (Exception ex)
			{
			@@ -68,8 +80,8 @@

			public static DataSet Get_GG_NoticeBillList(string sWhere)
			{
			var sql = "select A.HInterID,b.HEntryID,A.HBillNo,A.HContext,A.HDeptID,D.HName HDeptName, A.HSendMan, B.HReceiveMan,A.HLevel,A.HDescription,case when B.HReadFlag=0 then '未阅' when B.HReadFlag=1 then '已阅' end HReadFlag, A.HMaker,A.HDate,A.HUpDater,A.HUpDateDate" +
			" from OA_InformBillMain A inner join OA_InformBillSub B on A.HInterID=B.HInterID left join Gy_Department D on A.HDeptID=D.HItemID where 1=1 " + sWhere;
			var sql = "select A.HInterID 主内码,b.HEntryID 子内码,A.HBillNo 单据号,A.HContext 主题,A.HDeptID,D.HName 发送部门, A.HSendMan 发送人, B.HReceiveMan 接收人,A.HLevel 紧急程度,A.HDescription 详细内容,case when B.HReadFlag=0 then '未阅' when B.HReadFlag=1 then '已阅' end 状态, A.HMaker 制单人,A.HMakeDate 制单日期,A.HUpDater 修改人,A.HUpDateDate 修改日期" +
			" from OA_InformBillMain A inner join OA_InformBillSub B on A.HInterID=B.HInterID left join Gy_Department D on A.HDeptID=D.HItemID where 1=1 " + sWhere+ " order by 主内码 desc";
			return new SQLHelper.ClsCN().RunProcReturn(sql, "OA_InformBillMain");
			}

			@@ -84,7 +96,7 @@
			return new ApiResult<DataSet> { code = -1, msg = "ID不能为空" };
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			var dataSet = oCN.RunProcReturn("select A.HInterID,b.HEntryID,A.HBillNo,A.HContext,A.HDeptID,D.HName HDeptName, A.HSendMan, B.HReceiveMan,A.HLevel,A.HDescription,case when B.HReadFlag=0 then '未阅' when B.HReadFlag=1 then '已阅' end HReadFlag, A.HMaker,A.HDate,A.HUpDater,A.HUpDateDate" +
			var dataSet = oCN.RunProcReturn("select A.HInterID,b.HEntryID,A.HBillNo,A.HContext,A.HDeptID,D.HName HDeptName, A.HSendMan, B.HReceiveMan,A.HLevel,A.HDescription,case when B.HReadFlag=0 then '未阅' when B.HReadFlag=1 then '已阅' end HReadFlag, A.HMaker,A.HMakeDate,A.HUpDater,A.HUpDateDate" +
			" from OA_InformBillMain A inner join OA_InformBillSub B on A.HInterID=B.HInterID left join Gy_Department D on A.HDeptID=D.HItemID where A.HInterID='"+ HID + "' and b.HEntryID='"+HEntryID+"'", "OA_InformBillMain");
			if (dataSet == null \|\| dataSet.Tables[0].Rows.Count == 0)
			return new ApiResult<DataSet> { code = -1, msg = "不存在单号" };
			@@ -114,7 +126,7 @@
			try
			{
			//编辑权限
			//if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, true, msg3))
			//if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, false, msg3))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			@@ -255,5 +267,44 @@
			}
			#endregion

			#region 公告列表删除
			[Route("GG_Notice/Get_GG_Notice_DeleteBill")]
			[HttpGet]
			public object Get_GG_Notice_DeleteBill(string HInterID, string user)
			{
			try
			{
			//删除权限
			//if (!DBUtility.ClsPub.Security_Log_second("", 1, false, user))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无删除权限！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			oCN.RunProc("delete from OA_InformBillSub where HInterID=" + HInterID);
			oCN.RunProc("delete from OA_InformBillMain where HInterID=" + HInterID);
			oCN.Commit();//提交事务
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "公告数据删除成功！";
			objJsonResult.data = null;
			return objJsonResult; ;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "公告数据删除失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			}
			}