MES-WEB-API.git

			@@ -152,24 +152,24 @@
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			if (ds.Tables[4].Rows.Count > 0)
			{
			objJsonResult.code = "1";
			objJsonResult.count = ds.Tables[3].Rows.Count;
			objJsonResult.Message = "获取资源绑定数据成功！";
			objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[4], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //序列化DataSet中的时间格式，然后再反序列化回来
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "暂无资源绑定！";
			objJsonResult.data = null;
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			//if (ds.Tables[4].Rows.Count > 0)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = ds.Tables[3].Rows.Count;
			objJsonResult.Message = "获取资源绑定数据成功！";
			objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[4], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //序列化DataSet中的时间格式，然后再反序列化回来
			objJsonResult.list = columnNameList;
			return objJsonResult;
			//}
			//else
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "暂无资源绑定！";
			// objJsonResult.data = null;
			// objJsonResult.list = columnNameList;
			// return objJsonResult;
			//}
			}
			catch (Exception e)
			{
			@@ -265,12 +265,238 @@
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			//if (ds.Tables[1].Rows.Count > 0)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = ds.Tables[0].Rows.Count;
			objJsonResult.Message = "获取资源绑定数据成功！";
			objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[1], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //序列化DataSet中的时间格式，然后再反序列化回来
			objJsonResult.list = columnNameList;
			return objJsonResult;
			//}
			//else
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "暂无资源绑定！";
			// objJsonResult.data = null;
			// objJsonResult.list = columnNameList;
			// return objJsonResult;
			//}
			}
			catch (Exception e)
			{

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = e.Message.ToString();
			objJsonResult.data = null;
			objJsonResult.list = columnNameList;
			}
			return objJsonResult;
			}
			#endregion


			#region [器具收发料明细报表列表]
			[Route("Sc_MESReportFrom/ReportMaterialReceiptBillList")]
			[HttpGet]
			public object ReportMaterialReceiptBillList(int page, int limit, string HStartDate,string HEndDate, string HNumber, string HBarCode, string HSupName)
			{
			List<object> columnNameList = new List<object>();
			try
			{
			int count = 0;
			int pageNum = page;
			int pageSize = limit;


			ds = oCN.RunProcReturn("exec h_p_Mes_ReportMaterialReceipt '" + HStartDate + "','" + HEndDate + "','" + HNumber + "','" + HBarCode + "','" + HSupName + "'," + pageSize + "," + pageNum + "", "h_p_Mes_ReportMaterialReceipt");
			string aa = ds.Tables[0].Columns[0].ToString();

			foreach (DataColumn col in ds.Tables[1].Columns)
			{

			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			if (ds.Tables[1].Rows.Count > 0)
			{
			objJsonResult.code = "1";
			objJsonResult.count = ds.Tables[0].Rows.Count;
			objJsonResult.Message = "获取资源绑定数据成功！";
			objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[1], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //序列化DataSet中的时间格式，然后再反序列化回来
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无数据！";
			objJsonResult.data = null;
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = e.Message.ToString();
			objJsonResult.data = null;
			objJsonResult.list = columnNameList;
			}
			return objJsonResult;
			}
			#endregion

			#region [器具收发料汇总报表列表]
			[Route("Sc_MESReportFrom/ReportMaterialReceiptBillSumList")]
			[HttpGet]
			public object ReportMaterialReceiptBillSumList(int page, int limit, string HStartDate, string HEndDate, string HNumber, string HSupName)
			{
			List<object> columnNameList = new List<object>();
			try
			{
			int count = 0;
			int pageNum = page;
			int pageSize = limit;


			ds = oCN.RunProcReturn("exec h_p_Mes_ReportMaterialReceiptSum '" + HStartDate + "','" + HEndDate + "','" + HNumber + "','" + HSupName + "'," + pageSize + "," + pageNum + "", "h_p_Mes_ReportMaterialReceiptSum");
			string aa = ds.Tables[0].Columns[0].ToString();

			foreach (DataColumn col in ds.Tables[1].Columns)
			{

			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			//if (ds.Tables[1].Rows.Count > 0)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = ds.Tables[0].Rows.Count;
			objJsonResult.Message = "获取资源绑定数据成功！";
			objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[1], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //序列化DataSet中的时间格式，然后再反序列化回来
			objJsonResult.list = columnNameList;
			return objJsonResult;
			//}
			//else
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无数据！";
			// objJsonResult.data = null;
			// objJsonResult.list = columnNameList;
			// return objJsonResult;
			//}
			}
			catch (Exception e)
			{

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = e.Message.ToString();
			objJsonResult.data = null;
			objJsonResult.list = columnNameList;
			}
			return objJsonResult;
			}
			#endregion


			#region [器具可用数据表报表列表明细]
			[Route("Sc_MESReportFrom/Get_MouldAvailableListToSub")]
			[HttpGet]
			public object Get_MouldAvailableListToSub(int page, int limit, string HNumber, string HBarCode)
			{
			List<object> columnNameList = new List<object>();
			try
			{
			int count = 0;
			int pageNum = page;
			int pageSize = limit;


			ds = oCN.RunProcReturn("exec h_p_Sc_MouldAvailableListToSub '" + HNumber + "','" + HBarCode + "'," + pageSize + "," + pageNum + "", "h_p_Sc_MouldAvailableListToSub");
			string aa = ds.Tables[0].Columns[0].ToString();

			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.Tables[4].Rows.Count > 0)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = ds.Tables[0].Rows.Count;
			objJsonResult.Message = "查询成功！";
			objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //序列化DataSet中的时间格式，然后再反序列化回来
			objJsonResult.list = columnNameList;
			return objJsonResult;
			//}
			//else
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "暂无资源绑定！";
			// objJsonResult.data = null;
			// objJsonResult.list = columnNameList;
			// return objJsonResult;
			//}
			}
			catch (Exception e)
			{

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = e.Message.ToString();
			objJsonResult.data = null;
			objJsonResult.list = columnNameList;
			}
			return objJsonResult;
			}
			#endregion

			#region [器具即时库存汇总报表列表]
			[Route("Sc_MESReportFrom/Get_MouldAvailableListToSum")]
			[HttpGet]
			public object Get_MouldAvailableListToSum(int page, int limit, string HNumber)
			{
			List<object> columnNameList = new List<object>();
			try
			{
			int count = 0;
			int pageNum = page;
			int pageSize = limit;


			ds = oCN.RunProcReturn("exec h_p_Sc_MouldAvailableListToSum '" + HNumber + "'," + pageSize + "," + pageNum + "", "h_p_Sc_MouldAvailableListToSum");
			string aa = ds.Tables[0].Columns[0].ToString();

			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.Tables[0].Rows.Count > 0)
			{
			objJsonResult.code = "1";
			objJsonResult.count = ds.Tables[0].Rows.Count;
			objJsonResult.Message = "查询成功！";
			objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //序列化DataSet中的时间格式，然后再反序列化回来
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			@@ -296,6 +522,8 @@
			return objJsonResult;
			}
			#endregion


			}
			}