MES-WEB-API.git

			@@ -10,11 +10,15 @@
			using System.Linq;
			using System.Net;
			using System.Net.Http;
			using System.Text.RegularExpressions;
			using System.Web;
			using System.Web.Http;
			using WebAPI;
			using WebAPI.Code;
			using WebAPI.Controllers.SCGL.日计划管理;
			using WebAPI.Models;
			using static WebAPI.Controllers.基础资料.基础资料.Gy_DutyBillController;

			namespace WebAPI.Controllers
			{
			public class MateOutController : ApiController
			@@ -534,8 +538,8 @@
			List<Model.ClsKf_MateOutBillMain> lsmain = new List<Model.ClsKf_MateOutBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getMateOutBillMainByJson(msg1);
			lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
			//lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			//lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
			string sSourceBillType = lsmain[0].HBillType;//源单类型

			WebAPI.WebS.ClsKf_MateOutBillMain websLsmain = new WebS.ClsKf_MateOutBillMain();
			@@ -545,6 +549,9 @@
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HDeptID = lsmain[0].HDeptID;
			websLsmain.HEmpID = lsmain[0].HEmpID;
			websLsmain.HKeeperID = lsmain[0].HKeeperID;
			websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
			websLsmain.HBillerID = lsmain[0].HBillerID;
			websLsmain.HRemark = lsmain[0].HRemark;
			websLsmain.HMaker = lsmain[0].HMaker;
			websLsmain.HBillType = "1204";//固定值
			@@ -553,7 +560,8 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "生成领料单成功！单据号为：";
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //成功！
			//objJsonResult.Message = "生成领料单成功！单据号为：";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -561,7 +569,8 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //失败！
			//objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -618,7 +627,8 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "生成退料单成功！单据号为：";
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //成功！
			//objJsonResult.Message = "生成退料单成功！单据号为：";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -626,7 +636,8 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //失败！
			//objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1335,24 +1346,42 @@
			public string HProductName;
			public string HProductModel;
			public string RandomSearch;
			public string OtherSearch;
			}

			#region 白坯发布汇总报表
			[Route("MaterOutSumReport/MaterOutSumReport_Cloth")]
			[HttpGet]
			public object MaterOutSumReport_Cloth(string sWhere)
			public object MaterOutSumReport_Cloth(string sWhere, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Kf_MaterOutSumReport_Cloth", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//反序列化传递的值
			MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());

			string sql = "" +
			"( (日期 between ''" + com.HBeginDate + "'' and ''" + com.HEndDate + "'') or (''" + com.HBeginDate + "'' = '''' and ''" + com.HEndDate + "''='''') ) " +
			"and (产品代码=''" + com.HMaterNumber + "'' or ''" + com.HMaterNumber + "''='''') " +
			"and (单据号=''" + com.HBillNo + "'' or ''"+ com.HBillNo + "''='''') " +
			"and (单据号=''" + com.HBillNo + "'' or ''" + com.HBillNo + "''='''') " +
			"and (产品名称=''" + com.HProductName + "'' or ''" + com.HProductName + "''='''') " +
			"and (规格型号=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch;
			"and (规格型号=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch +
			" " + com.OtherSearch;

			//string sql = "" +
			// "( (日期 between ''" + com.HBeginDate + "'' and ''" + com.HEndDate + "'') or (''" + com.HBeginDate + "'' = '''' and ''" + com.HEndDate + "''='''') ) " +
			// "and (产品代码=''" + com.HMaterNumber + "'' or ''" + com.HMaterNumber + "''='''') " +
			// "and (单据号=''" + com.HBillNo + "'' or ''" + com.HBillNo + "''='''') " +
			// "and (产品名称=''" + com.HProductName + "'' or ''" + com.HProductName + "''='''') " +
			// "and (规格型号=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch;

			ds = oCN.RunProcReturn($"exec h_p_Kf_MaterOutSumReport_Cloth_New '{sql}'" , "h_p_Kf_MaterOutSumReport_Cloth_New");

			@@ -1361,20 +1390,20 @@
			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			int headLen = col.ColumnName.ToString().Length; //列名的长度
			int colLen = 0;
			if (ds.Tables[1].Rows[0][col.ColumnName] != null)
			{
			string colLenStr=ds.Tables[1].Rows[0][col.ColumnName].ToString();
			if(colLenStr != "")
			{
			colLen = int.Parse(colLenStr); //列中最长数据的长度
			}
			//int headLen = col.ColumnName.ToString().Length; //列名的长度
			//int colLen = 0;
			//if (ds.Tables[1].Rows[0][col.ColumnName] != null)
			//{
			// string colLenStr=ds.Tables[1].Rows[0][col.ColumnName].ToString();
			// if(colLenStr != "")
			// {
			// colLen = int.Parse(colLenStr); //列中最长数据的长度
			// }

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

			@@ -1399,10 +1428,19 @@
			#region 白坯发布明细报表
			[Route("MaterOutEntryReport/MaterOutEntryReport_Cloth")]
			[HttpGet]
			public object MaterOutEntryReport_Cloth(string sWhere)
			public object MaterOutEntryReport_Cloth(string sWhere, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Kf_MaterOutEntryReport_Cloth", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//反序列化传递的值
			MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());

			@@ -1422,20 +1460,20 @@
			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			int headLen = col.ColumnName.ToString().Length; //列名的长度
			int colLen = 0;
			if (ds.Tables[1].Rows[0][col.ColumnName] != null)
			{
			string colLenStr = ds.Tables[1].Rows[0][col.ColumnName].ToString();
			if (colLenStr != "")
			{
			colLen = int.Parse(colLenStr); //列中最长数据的长度
			}
			//int headLen = col.ColumnName.ToString().Length; //列名的长度
			//int colLen = 0;
			//if (ds.Tables[1].Rows[0][col.ColumnName] != null)
			//{
			// string colLenStr = ds.Tables[1].Rows[0][col.ColumnName].ToString();
			// if (colLenStr != "")
			// {
			// colLen = int.Parse(colLenStr); //列中最长数据的长度
			// }

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

			@@ -1457,17 +1495,24 @@
			}
			#endregion



			#region 染厂汇总报表

			#region 染厂汇总报表
			[Route("ProdProcessSumReport/ProdProcessSumReport_DyeColor")]
			[HttpGet]
			public object ProdProcessSumReport_DyeColor(string sWhere)
			public object ProdProcessSumReport_DyeColor(string sWhere, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Kf_ProdProcessSumReport_DyeColor", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//反序列化传递的值
			MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());

			@@ -1476,7 +1521,15 @@
			"and (产品代码=''" + com.HMaterNumber + "'' or ''" + com.HMaterNumber + "''='''') " +
			"and (生产订单号=''" + com.HBillNo + "'' or ''" + com.HBillNo + "''='''') " +
			"and (产品名称=''" + com.HProductName + "'' or ''" + com.HProductName + "''='''') " +
			"and (规格型号=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch;
			"and (规格型号=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch +
			" " + com.OtherSearch;

			//string sql = "" +
			// "( (生产订单日期 between ''" + com.HBeginDate + "'' and ''" + com.HEndDate + "'') or (''" + com.HBeginDate + "'' = '''' and ''" + com.HEndDate + "''='''') ) " +
			// "and (产品代码=''" + com.HMaterNumber + "'' or ''" + com.HMaterNumber + "''='''') " +
			// "and (生产订单号=''" + com.HBillNo + "'' or ''" + com.HBillNo + "''='''') " +
			// "and (产品名称=''" + com.HProductName + "'' or ''" + com.HProductName + "''='''') " +
			// "and (规格型号=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch;

			ds = oCN.RunProcReturn($"exec h_p_Kf_ProdProcessSumReport_DyeColor '{sql}'", "h_p_Kf_ProdProcessSumReport_DyeColor");

			@@ -1512,15 +1565,24 @@
			#region 染厂明细报表
			[Route("ProdProcessEntryReport/ProdProcessEntryReport_DyeColor")]
			[HttpGet]
			public object ProdProcessEntryReport_DyeColor(string sWhere,string sProcessNo)
			public object ProdProcessEntryReport_DyeColor(string sWhere,string sProcessNo,string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Kf_ProdProcessEntryReport_DyeColor", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//反序列化传递的值
			MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());

			string sql = "" +
			"( (工艺单日期 between ''" + com.HBeginDate + "'' and ''" + com.HEndDate + "'') or (''" + com.HBeginDate + "'' = '''' and ''" + com.HEndDate + "''='''') ) " +
			"( (生产订单日期 between ''" + com.HBeginDate + "'' and ''" + com.HEndDate + "'') or (''" + com.HBeginDate + "'' = '''' and ''" + com.HEndDate + "''='''') ) " +
			"and (产品代码=''" + com.HMaterNumber + "'' or ''" + com.HMaterNumber + "''='''') " +
			"and (生产订单号=''" + com.HBillNo + "'' or ''" + com.HBillNo + "''='''') " +
			"and (产品名称=''" + com.HProductName + "'' or ''" + com.HProductName + "''='''') " +
			@@ -1558,15 +1620,22 @@
			#endregion




			#region 第三个报表
			#region 染厂产量报表
			[Route("ProdProcessSumReport/ProdProcessSumReport_DyeColor_third")]
			[HttpGet]
			public object ProdProcessSumReport_DyeColor_third(string sWhere)
			public object ProdProcessSumReport_DyeColor_third(string sWhere,string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Kf_ProdProcessSumReport_DyeColor_third", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//反序列化传递的值
			MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());

			@@ -1575,7 +1644,8 @@
			"and (产品代码=''" + com.HMaterNumber + "'' or ''" + com.HMaterNumber + "''='''') " +
			"and (生产订单号=''" + com.HBillNo + "'' or ''" + com.HBillNo + "''='''') " +
			"and (产品名称=''" + com.HProductName + "'' or ''" + com.HProductName + "''='''') " +
			"and (产品规格=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch;
			"and (产品规格=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch +
			" " + com.OtherSearch; ;

			ds = oCN.RunProcReturn($"exec h_p_Kf_ProdProcessSumReport_DyeColor_third '{sql}'", "h_p_Kf_ProdProcessSumReport_DyeColor_third");

			@@ -1607,12 +1677,1646 @@
			}
			#endregion

			#region 烘干定型出站
			[Route("ProdProcessSumReport/Kf_DryFinalizeOutReport")]
			[HttpGet]
			public object Kf_DryFinalizeOutReport(string sWhere, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Kf_DryFinalizeOutReport", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn($"select * from h_v_Kf_DryFinalizeOutReport where 1=1 "+sWhere, "h_v_Kf_DryFinalizeOutReport");

			//获取列名
			List<object> columnNameList = new List<object>();
			//添加列名
			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.list = columnNameList;
			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("ProdProcessSumReport/Kf_SizingFinalizeOutReport")]
			[HttpGet]
			public object Kf_SizingFinalizeOutReport(string sWhere, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Kf_SizingFinalizeOutReport", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn($"select * from h_v_Kf_SizingFinalizeOutReport where 1=1 " + sWhere, "h_v_Kf_SizingFinalizeOutReport");

			//获取列名
			List<object> columnNameList = new List<object>();
			//添加列名
			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.list = columnNameList;
			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("ProdProcessSumReport/Kf_BrushingOutReport")]
			[HttpGet]
			public object Kf_BrushingOutReport(string sWhere, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Kf_BrushingOutReport", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn($"select * from h_v_Kf_BrushingOutReport where 1=1 " + sWhere, "h_v_Kf_BrushingOutReport");

			//获取列名
			List<object> columnNameList = new List<object>();
			//添加列名
			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.list = columnNameList;
			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("ProdProcessSumReport/Kf_ColorBlankLustringOutReport")]
			[HttpGet]
			public object Kf_ColorBlankLustringOutReport(string sWhere, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Kf_ColorBlankLustringOutReport", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn($"select * from h_v_Kf_ColorBlankLustringOutReport where 1=1 " + sWhere, "h_v_Kf_ColorBlankLustringOutReport");

			//获取列名
			List<object> columnNameList = new List<object>();
			//添加列名
			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.list = columnNameList;
			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("ProdProcessSumReport/Kf_PressurizedWaterOutReport")]
			[HttpGet]
			public object Kf_PressurizedWaterOutReport(string sWhere,string HBillType,string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log(HBillType, 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			switch (HBillType)
			{
			case "Kf_PressurizedWaterOutReport"://毛尖压水出站
			ds = oCN.RunProcReturn($"select * from h_v_Kf_PressurizedWaterOutReport where 1=1 " + sWhere, "h_v_Kf_PressurizedWaterOutReport");
			break;
			case "Kf_HairtipReport"://毛尖毛尖出站
			ds = oCN.RunProcReturn($"select * from h_v_Kf_HairtipReport where 1=1 " + sWhere, "h_v_Kf_HairtipReport");
			break;
			case "Kf_DigitalSprayPaintingReport"://毛尖数码喷花出站
			ds = oCN.RunProcReturn($"select * from h_v_Kf_DigitalSprayPaintingReport where 1=1 " + sWhere, "h_v_Kf_DigitalSprayPaintingReport");
			break;
			case "Kf_ShrinkBrushReport"://后整二号缩刷出站
			ds = oCN.RunProcReturn($"select * from h_v_Kf_ShrinkBrushReport where 1=1 " + sWhere, "h_v_Kf_ShrinkBrushReport");
			break;
			case "Kf_FinalizeTheDesignOutReport"://后整二号定型出站
			ds = oCN.RunProcReturn($"select * from h_v_Kf_FinalizeTheDesignOutReport where 1=1 " + sWhere, "h_v_Kf_FinalizeTheDesignOutReport");
			break;
			case "Kf_LustringOutReport"://后整二号烫光出站
			ds = oCN.RunProcReturn($"select * from h_v_Kf_LustringOutReport where 1=1 " + sWhere, "h_v_Kf_LustringOutReport");
			break;
			case "Kf_ShrinkBrushOutReport"://后整一号缩刷出站
			ds = oCN.RunProcReturn($"select * from h_v_Kf_ShrinkBrushOutReport where 1=1 " + sWhere, "h_v_Kf_ShrinkBrushOutReport");
			break;
			case "Kf_FinalizeOutReport"://后整一号定型出站
			ds = oCN.RunProcReturn($"select * from h_v_Kf_FinalizeOutReport where 1=1 " + sWhere, "h_v_Kf_FinalizeOutReport");
			break;
			case "Kf_LustringReport"://后整一号烫光出站
			ds = oCN.RunProcReturn($"select * from h_v_Kf_LustringReport where 1=1 " + sWhere, "h_v_Kf_LustringReport");
			break;
			case "Kf_ShrinkBrushTeReport"://特整缩刷出站
			ds = oCN.RunProcReturn($"select * from h_v_Kf_ShrinkBrushTeReport where 1=1 " + sWhere, "h_v_Kf_ShrinkBrushTeReport");
			break;
			case "Kf_EmbossingOutReport"://特整压花出站
			ds = oCN.RunProcReturn($"select * from h_v_Kf_EmbossingOutReport where 1=1 " + sWhere, "h_v_Kf_EmbossingOutReport");
			break;
			case "Kf_StereoscopicFlowerOutReport"://特整立体花型机出站
			ds = oCN.RunProcReturn($"select * from h_v_Kf_StereoscopicFlowerOutReport where 1=1 " + sWhere, "h_v_Kf_StereoscopicFlowerOutReport");
			break;
			}


			//获取列名
			List<object> columnNameList = new List<object>();
			//添加列名
			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.list = columnNameList;
			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 压水未出站报表查询
			/// <summary>
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Kf_PressurizedWaterNoOutReport/list")]
			[HttpGet]
			public object GetKf_PressurizedWaterNoOutReport(string sWhere, string user, string userid)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			////查看权限
			if (!DBUtility.ClsPub.Security_Log("Kf_PressurizedWaterNoOutReport_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}


			//查询
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			string sql = "exec h_p_Kf_PressurizedWaterNoOutReport '','" + userid + "'";
			ds = oCN.RunProcReturn(sql, "h_p_Kf_PressurizedWaterNoOutReport");
			}
			else
			{
			string sql = "exec h_p_Kf_PressurizedWaterNoOutReport '" + sWhere + "','" + userid + "'";
			ds = oCN.RunProcReturn(sql, "h_p_Kf_PressurizedWaterNoOutReport");
			}

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

			#region 领料统计报表
			/// <summary>
			/// 领料统计报表
			/// </summary>
			/// <returns></returns>
			[Route("MateOutController/GetKf_MateOutSumReport_QiaoYi_Json")]
			[HttpGet]
			public object GetKf_MateOutSumReport_QiaoYi_Json(string sWhere, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Kf_MateOutSumReport_QiaoYi", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("exec h_p_Kf_MateOutSumReport_QiaoYi " + sWhere, "h_p_Kf_MateOutSumReport_QiaoYi");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前所输入过滤条件，没有返回任何结果！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//添加列名
			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 = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "成功！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查询领料统计报表信息失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion


			#endregion

			#region (生产订单维度)客户订单报表
			[Route("MaterOutEntryReport/sc_ICOMReportList")]
			[HttpGet]
			public object sc_ICOMReportList(string sWhere,string HBeginDate,string HEndDate, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("sc_ICOMReportList", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}


			string sql = "exec h_p_sc_ICOMReport '"+ sWhere + "','"+ HBeginDate + "','"+ HEndDate + "'";

			ds = oCN.RunProcReturn(sql, "h_p_sc_ICOMReport");

			DataTable dt = ds.Tables[0];

			//获取列名
			List<object> columnNameList = new List<object>();
			//添加列名
			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.list = columnNameList;
			objJsonResult.data = dt;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 客户订单明细报表
			[Route("MaterOutEntryReport/Sc_ICOMProBarCodeReport")]
			[HttpGet]
			public object Sc_ICOMProBarCodeReport(string sWhere)
			{
			try
			{
			string sql = "select * from h_v_sc_ICOMProBarCodeReport where 1=1 " + sWhere;

			ds = oCN.RunProcReturn(sql, "h_v_sc_ICOMProBarCodeReport");

			DataTable dt = ds.Tables[0];

			//获取列名
			List<object> columnNameList = new List<object>();
			//添加列名
			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.list = columnNameList;
			objJsonResult.data = dt;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 流转卡未入库报表
			[Route("MaterOutEntryReport/Sc_ProcExchangeNoInReport")]
			[HttpGet]
			public object Sc_ProcExchangeNoInReport(string sWhere, string HBeginDate, string HEndDate, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Sc_ProcExchangeNoInReport", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			string sql = "exec h_p_Sc_ProcExchangeNoInReport '" + sWhere + "','" + HBeginDate + "','" + HEndDate + "'";

			ds = oCN.RunProcReturn(sql, "h_p_Sc_ProcExchangeNoInReport");

			DataTable dt = ds.Tables[0];

			//获取列名
			List<object> columnNameList = new List<object>();
			//添加列名
			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.list = columnNameList;
			objJsonResult.data = dt;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 生产入库报表
			[Route("MaterOutEntryReport/sc_ICOMRKReport")]
			[HttpGet]
			public object sc_ICOMRKReport(string sWhere, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("sc_ICOMRKReport", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			string sql = "select * from h_v_sc_ICOMRKReport where 1=1 " + sWhere + " order by 日期 ";

			ds = oCN.RunProcReturn(sql, "h_v_sc_ICOMRKReport");

			DataTable dt = ds.Tables[0];

			//获取列名
			List<object> columnNameList = new List<object>();
			//添加列名
			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.list = columnNameList;
			objJsonResult.data = dt;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 不良原因分析报表
			/// <summary>
			/// 返回不良原因分析报表列表
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Sc_BadReasonReport/list")]
			[HttpGet]
			public object list(string sWhere, string user,string HGroupID)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Sc_BadReasonReport", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			List<object> columnNameList = new List<object>();

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "请选择有效年份";
			return objJsonResult;
			}
			else
			{
			ds = oCN.RunProcReturn("exec h_p_Sc_BadReasonReport '" + sWhere + "','" + HGroupID + "'", "h_p_Sc_BadReasonReport");
			}

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

			#region 生产入库报表
			[Route("MaterOutEntryReport/sc_ICOMRKBanReport")]
			[HttpGet]
			public object sc_ICOMRKBanReport(string sWhere)
			{
			try
			{
			string sql = "select * from h_v_sc_ICOMRKBanReport where 1=1 " + sWhere + " order by 日期 ";

			ds = oCN.RunProcReturn(sql, "h_v_sc_ICOMRKBanReport");

			DataTable dt = ds.Tables[0];

			//获取列名
			List<object> columnNameList = new List<object>();
			//添加列名
			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.list = columnNameList;
			objJsonResult.data = dt;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 生产日记报表
			public class DayRkReport {
			public string HBeginDate { get; set; }
			public string HEndDate { get; set; }
			public string HMaterNumber { get; set; }
			public string HCustomerName { get; set; }
			public string HProductName { get; set; }
			public string HOtherSearch { get; set; }
			public string HEmpName { get; set; }
			public string sWheres { get; set; }
			}
			[Route("MaterOutEntryReport/SC_DayRkReport")]
			[HttpGet]
			public object SC_DayRkReport(string sWhere,int num, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("SC_DayRkReport", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			DayRkReport DayRkReportList = JsonConvert.DeserializeObject<DayRkReport>(sWhere);

			string sql = $"exec h_p_Gy_DayRkReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" +
			$",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}','{DayRkReportList.HOtherSearch}','{DayRkReportList.HEmpName}','{DayRkReportList.sWheres}'";
			//string sql = $"exec h_p_Gy_DayRkReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" +
			// $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}'";

			ds = oCN.RunProcReturn(sql, "h_p_Gy_DayRkReport");

			DataTable dt = null;
			if (num == 1)
			{
			dt = ds.Tables[0];
			}
			else if (num == 2)
			{
			dt = ds.Tables[1];
			}

			//获取列名
			List<object> columnNameList = new List<object>();
			if (num == 1)
			{
			//添加列名
			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列对象的列名
			}
			}
			else if (num == 2)
			{
			//添加列名
			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列对象的列名
			}
			}

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

			#region 半成品报表
			public class SemiFinishedProductsReport
			{
			public string HBeginDate { get; set; }
			public string HEndDate { get; set; }
			public string HMaterNumber { get; set; }
			public string HCustomerName { get; set; }
			public string HProductName { get; set; }
			public string HOtherSearch { get; set; }
			}
			[Route("MaterOutEntryReport/SemiFinishedProductsReportList")]
			[HttpGet]
			public object SemiFinishedProductsReportList(string sWhere, int num, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("SemiFinishedProductsReportList", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			SemiFinishedProductsReport DayRkReportList = JsonConvert.DeserializeObject<SemiFinishedProductsReport>(sWhere);

			string sql = $"exec h_p_sc_SemiFinishedProductsReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" +
			$",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}','{DayRkReportList.HOtherSearch}'";
			//string sql = $"exec h_p_sc_SemiFinishedProductsReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" +
			// $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}'";
			ds = oCN.RunProcReturn(sql, "h_p_Gy_DayRkReport");

			DataTable dt = null;
			if (num == 1)
			{
			dt = ds.Tables[0];
			}
			else if (num == 2)
			{
			dt = ds.Tables[1];
			}

			//获取列名
			List<object> columnNameList = new List<object>();
			if (num == 1)
			{
			//添加列名
			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列对象的列名
			}
			}
			else if (num == 2)
			{
			//添加列名
			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列对象的列名
			}
			}

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

			#region 产线查询
			[Route("MaterOutEntryReport/Gy_SourceList")]
			[HttpGet]
			public object Gy_SourceList(string HOrgid,string sWhere)
			{
			try
			{
			string sql1 = string.Format("select hitemid,hnumber,hname from Gy_Source where HUSEORGID="+ HOrgid + " "+ sWhere + " order by hnumber");

			ds = oCN.RunProcReturn(sql1, "Gy_Source");

			List<TreeModel> treeModels = new List<TreeModel>();
			TreeModel first = new TreeModel();
			first.id = "0";
			first.title = "产线设置";
			treeModels.Add(first);

			foreach (DataRow row in ds.Tables[0].Rows)
			{
			var strLen = row["hitemid"].ToString().Split('.');
			if (strLen.Length == 1)
			{
			TreeModel tree = new TreeModel();
			tree.id = row["hitemid"].ToString();
			tree.title = row["hname"].ToString();
			treeModels[0].children.Add(tree);
			}
			}
			digui(ds.Tables[0], treeModels[0].children, 2);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(treeModels);
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			/// <summary>
			/// 递归函数
			/// </summary>
			public void digui(DataTable dt, List<TreeModel> tree, int num)
			{
			for (int m = 0; m < tree.Count; m++)
			{
			tree[m].children = new List<TreeModel>();
			for (int i = 0; i < dt.Rows.Count; i++)//第一次循环，得到所有根节点的子集
			{
			var strLen = dt.Rows[i]["hnumber"].ToString().Split('.');
			if (strLen.Length == num && dt.Rows[i]["hnumber"].ToString().Contains(tree[m].id + "."))
			{
			TreeModel tbjson = new TreeModel();
			tbjson.id = dt.Rows[i]["hitemid"].ToString();
			tbjson.title = dt.Rows[i]["hname"].ToString();
			tree[m].children.Add(tbjson);
			}
			}
			var strLens = tree[m].id.Split('.');
			for (int i = 0; i < tree[m].children.Count; i++)
			{
			digui(dt, tree[m].children, strLens.Length + 2);//再次用子集去循环，拿出子集的子集
			}
			}

			}
			#endregion

			#region 工厂日历查询
			[Route("MaterOutEntryReport/Sc_ShopCalendar")]
			[HttpGet]
			public object Sc_ShopCalendar(string sWhere,string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_PlanShifts_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查询权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			string sql1 = string.Format("select * from h_v_Gy_PlanShiftsList where 1=1 " + sWhere);

			ds = oCN.RunProcReturn(sql1, "h_v_Gy_PlanShiftsList");

			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("MaterOutEntryReport/Sc_ShopCalendarSave")]
			[HttpPost]
			public object Sc_ShopCalendarSave([FromBody] JObject sMainSub)
			{
			try
			{
			var _value = sMainSub["sMainSub"].ToString();
			string msg1 = _value.ToString();
			oCN.BeginTran();
			//保存主表
			objJsonResult = AddBillMain(msg1);
			if (objJsonResult.code == "0")
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = objJsonResult.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}
			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 = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			public json AddBillMain(string msg1)
			{
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string hdate = sArray[0].ToString();
			string hvalue = sArray[1].ToString();
			string TagId = sArray[2].ToString();
			string user = sArray[3].ToString();

			try
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_PlanShifts_Edit", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select * from Gy_PlanShifts where HDate='" + hdate + "' and HSourceID="+ TagId, "Gy_PlanShifts");
			string sql = "";
			if (ds.Tables[0].Rows.Count > 0)
			{
			sql = $"update Gy_PlanShifts set HOverTimes='" + hvalue + "' where HDate ='" + hdate + "' and HSourceID=" + TagId;
			}
			else
			{
			sql = $"insert into Gy_PlanShifts(HDate,HSourceID,HShiftsID,HOverTimes,HClassCount," +
			"HRemark,HUseFlag)values" +
			$"('{hdate}','{TagId}',0,'{hvalue}','1'" +
			$",'','未检测')";
			}



			oCN.RunProc(sql);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = null;
			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

			#region 工厂日历批改上班工时
			[Route("Gy_PlanShifts/BulkWorkTime")]
			[HttpGet]
			public object BulkWorkTime(string HSourceNumber1, string HSourceNumber2, string HBeginDate, string HEndDate,string HWorkTime)
			{
			try
			{
			oCN.BeginTran();

			string sql = $"update a set HOverTimes = {HWorkTime} from Gy_PlanShifts a left join Gy_Source b on a.HSourceID = b.HItemID where b.HNumber between '{HSourceNumber1}' and '{HSourceNumber2}' and CONVERT(varchar(120),a.HDate,23) between CONVERT(varchar(120),'{HBeginDate}',23) and CONVERT(varchar(120),'{HEndDate}',23)";

			//执行更新上班工时语句
			oCN.RunProc(sql);

			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "批改成功！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 工厂日历文件上传
			[Route("Gy_PlanShifts/Gy_PlanShifts_Excel")]
			[HttpPost]
			public object Gy_PlanShifts_Excel()
			{
			try
			{
			//var WorkBookName = HttpContext.Current.Request["WorkBookName"];
			//DBUtility.ClsPub.HOrgID = long.Parse(HttpContext.Current.Request["HOrgID"]);
			//获取文件名称
			var file = HttpContext.Current.Request.Files[0];
			//获取文件物理路径
			string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
			//保存文件
			file.SaveAs(ExcelPath);

			NpoiHelper np = new NpoiHelper();
			DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");

			//删除文件
			File.Delete(ExcelPath);

			//创建临时表
			DataTable tb2 = new DataTable("dt2");

			//添加列名
			for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
			{
			tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
			}

			//模板缺少列但需要从数据库中查询出来显示在页面的字段
			tb2.Columns.Add("HOrgID", typeof(Int32));//组织ID
			tb2.Columns.Add("HSourceID", typeof(Int32));//生产资源ID

			//添加数据
			for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
			{
			DataRow row = tb2.NewRow();
			for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
			{
			row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
			}
			//如果表格第i行的第一列为空，则判断为这一行的数据为空，跳出循环并且不把数据写入 tb2
			if (ExcelDs.Tables[0].Rows[i][0].ToString() == "")
			{
			continue;
			}
			else
			{
			tb2.Rows.Add(row);
			}
			}


			var error = "";

			//查询工艺路线没有的列
			if (!tb2.Columns.Contains("组织编码"))
			error += "没有找到【组织编码】的标题,";

			if (!tb2.Columns.Contains("组织"))
			error += "没有找到【组织】的标题,";

			if (!tb2.Columns.Contains("生产资源代码"))
			error += "没有找到【生产资源代码】的标题,";

			if (!tb2.Columns.Contains("生产资源"))
			error += "没有找到【生产资源】的标题,";

			if (!tb2.Columns.Contains("日期"))
			error += "没有找到【日期】的标题,";

			if (!tb2.Columns.Contains("工时"))
			error += "没有找到【工时】的标题,";


			if (error.Length > 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = $"Excel模板存在错误,{error}\r\n";
			objJsonResult.data = null;
			return objJsonResult;
			}

			for (int i = 0; i <= tb2.Rows.Count - 1; i++)
			{
			string HORGNumber = "";
			string HORGName = "";
			string HSourceNumer = "";
			string HSourceName = "";
			string HDate = "";
			string HOverTimes = "";

			HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织编码"].ToString());
			HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["组织"].ToString());
			HSourceNumer = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["生产资源代码"].ToString());
			HSourceName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["生产资源"].ToString());
			HDate = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["日期"].ToString());
			HOverTimes = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["工时"].ToString());

			//检查物料
			int index = i + 1;

			if (HORGNumber != "")
			{


			//查询组织
			ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,组织不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();


			//查询生产资源
			ds = oCN.RunProcReturn("select * from Gy_Source where HNumber='" + HSourceNumer + "' and HUSEORGID=" + HORGid + "", "Gy_Department");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,生产资源:" + HSourceName + ",不存在！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			tb2.Rows[i]["HSourceID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}

			//日期
			if (HDate == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,日期为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}else if(!Regex.IsMatch(HDate, @"^[0-9]{4}-(0[1-9]\|1[0-2])-(0[1-9]\|[12][0-9]\|3[01])$"))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,日期不为“yyyy-MM-dd”格式！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//工时
			if (HOverTimes == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,工时为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//else if (!Regex.IsMatch(HWorkTime, @"/^\d+(\.\d+)?$/"))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "第" + index + "行,工时不为非负数格式！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + index + "行,组织代码为空";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = error;
			objJsonResult.data = tb2;
			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_PlanShifts/Gy_PlanShifts_btnSave")]
			[HttpPost]
			public object Gy_PlanShifts_btnSave([FromBody] JObject sMainSub)
			{
			var _value = sMainSub["sMainSub"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { "&和" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string user = sArray[1].ToString();
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_PlanShifts_Edit", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
			List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();

			foreach (JObject item in Excel)
			{
			Dictionary<string, string> dic = new Dictionary<string, string>();
			foreach (var itm in item.Properties())
			{
			dic.Add(itm.Name, itm.Value.ToString());
			}
			list.Add(dic);
			}

			oCN.BeginTran();
			int i = 1;
			foreach (Dictionary<string, string> item in list)
			{
			string HSourceID = item["HSourceID"].ToString();//生产资源ID
			string HOrgID = item["HOrgID"].ToString();//组织ID
			string HDate = item["日期"].ToString();
			string HOverTimes = item["工时"].ToString();

			ds = oCN.RunProcReturn("select * from Gy_PlanShifts where HSourceID=" + HSourceID + " and convert(varchar(100),HDate,23)='" + HDate + "'", "Gy_PlanShifts");

			if (ds.Tables[0].Rows.Count == 0)
			{
			string sql = "insert into Gy_PlanShifts(HDate,HSourceID,HShiftsID,HOverTimes,HClassCount,HRemark,HUseFlag) " +
			"values(" +
			"'" + HDate + "'" +
			"," + HSourceID + "" +
			",0" +
			"," + HOverTimes + "" +
			",1" +
			",''" +
			",''" +
			")";

			//主表
			oCN.RunProc(sql);
			}
			else
			{
			oCN.RunProc("update Gy_PlanShifts set HOverTimes = " + HOverTimes + " where HSourceID=" + HSourceID + " and convert(varchar(100),HDate,23)='" + HDate + "'");
			}

			i++;
			}

			oCN.Commit();

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "导入成功!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			LogService.Write(e);
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 制成率明细报表
			[Route("MaterOutEntryReport/Sc_ProductedRateReport")]
			[HttpGet]
			public object Sc_ProductedRateReport(string HBeginDate,string HEndDate,string sWhere,double HRate_BeyondICMOQty, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Sc_ProductedRateReport", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			string sql = "exec h_p_Sc_ProductedRateReport '" + HBeginDate + "','" + HEndDate + "','" + sWhere + "'," + HRate_BeyondICMOQty;

			ds = oCN.RunProcReturn(sql, "h_p_Sc_ProductedRateReport");

			DataTable dt = ds.Tables[0];

			//获取列名
			List<object> columnNameList = new List<object>();
			//添加列名
			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.list = columnNameList;
			objJsonResult.data = ds.Tables;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 滞留时间报表
			[Route("MaterOutEntryReport/Sc_RetentionTimeReport")]
			[HttpGet]
			public object Sc_RetentionTimeReport(string HBeginDate,string HEndDate,string sWhere, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Sc_RetentionTimeReport", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			string sql = "exec h_p_Sc_RetentionTimeReport '" + HBeginDate + "','" + HEndDate + "','" + sWhere + "'";

			ds = oCN.RunProcReturn(sql, "h_p_Sc_RetentionTimeReport");

			DataTable dt = ds.Tables[0];

			//获取列名
			List<object> columnNameList = new List<object>();
			//添加列名
			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.list = columnNameList;
			objJsonResult.data = ds.Tables;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 销售价格对比报表
			[Route("MaterOutEntryReport/Sc_CompareOrderToSelloutReport")]
			[HttpGet]
			public object Sc_CompareOrderToSelloutReport(string HBeginDate, string HEndDate, string sWhere, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Sc_CompareOrderToSelloutReport", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			string sql = "exec h_p_Sc_CompareOrderToSelloutReport '" + HBeginDate + "','" + HEndDate + "','" + sWhere + "'";

			ds = oCN.RunProcReturn(sql, "h_p_Sc_CompareOrderToSelloutReport");

			DataTable dt = ds.Tables[0];

			//获取列名
			List<object> columnNameList = new List<object>();
			//添加列名
			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.list = columnNameList;
			objJsonResult.data = ds.Tables;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 销售排名报表
			[Route("MaterOutEntryReport/Xs_SellOutMoneyRangeReport")]
			[HttpGet]
			public object Xs_SellOutMoneyRangeReport(string sWhere, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Xs_SellOutMoneyRangeReport", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			List<object> columnNameList = new List<object>();

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "请选择有效年份";
			return objJsonResult;
			}
			else
			{
			ds = oCN.RunProcReturn("exec h_p_Xs_SellOutMoneyRangeReport '" + sWhere + "'", "h_p_Xs_SellOutMoneyRangeReport");
			}

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

			#region 销售订单条码出入库详情
			[Route("MaterOutEntryReport/Xs_SeOrderBarCodeInAndOutStockDetailReport")]
			[HttpGet]
			public object Xs_SeOrderBarCodeInAndOutStockDetailReport(string sWhere, string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBarCodeInAndOutStockDetailReport", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			string sql = "select * from h_v_Xs_SeOrderBarCodeInAndOutStockDetailReport_Query where 1=1 " + sWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Xs_SeOrderBarCodeInAndOutStockDetailReport_Query");

			DataTable dt = ds.Tables[0];

			//获取列名
			List<object> columnNameList = new List<object>();
			//添加列名
			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.list = columnNameList;
			objJsonResult.data = ds.Tables;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#endregion

			}