~yxj/MES-WEB-API.git

			@@ -15,6 +15,8 @@
			using WebAPI;
			using WebAPI.Code;
			using WebAPI.Models;
			using static WebAPI.Controllers.基础资料.基础资料.Gy_DutyBillController;

			namespace WebAPI.Controllers
			{
			public class MateOutController : ApiController
			@@ -49,7 +51,8 @@
			public WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
			// private DataBaseServices objDataBaseServices = new DataBaseServices();
			private json objJsonResult = new json();
			// private string msgModel = "{{\"count\":{0},\"code\":{0},\"message\":\"{1}\",\"result\":{2}}}";
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
			// private string msgModel = "{{\"count\":{0},\"code\":{0},\"message\":\"{1}\",\"result\":{2}}}";
			public static string GetSession(string sMsg)
			{
			try
			@@ -533,8 +536,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();
			@@ -552,7 +555,8 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "生成领料单成功！单据号为：";
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //成功！
			//objJsonResult.Message = "生成领料单成功！单据号为：";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -560,7 +564,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;
			}
			@@ -617,7 +622,8 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "生成退料单成功！单据号为：";
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //成功！
			//objJsonResult.Message = "生成退料单成功！单据号为：";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -625,7 +631,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;
			}
			@@ -652,9 +659,23 @@
			[HttpGet]
			public Object get_CheckTypeByBarCode_Json(string sCode, Int64 sInterID, string HBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID)
			{

			try
			{
			var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo,sMaker);
			string sErrMsg = "";
			string sJXCode = "";
			if (oSystemParameter.omodel.WMS_CampanyName == "安瑞") //系统参数客户定制化名称空白为通用
			{
			sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
			SourceFlag = true;
			}
			else
			{
			sJXCode = sCode;
			}


			//var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo,sMaker);
			string sExpressNumber = "";
			WebSoBar = oWebs.get_CheckTypeByBarCode_All(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);

			@@ -866,8 +887,8 @@
			objJsonResult.data = new
			{
			list = ds.Tables[0]
			//,
			//list2 = ds.Tables[5]
			,
			list2 = ds.Tables[5]
			};
			return objJsonResult;
			}
			@@ -1048,6 +1069,7 @@
			{
			try
			{

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			List<object> columnNameList = new List<object>();
			DataSet ds = oCN.RunProcReturn("exec h_p_KF_ICInventoryByMaterIDList1 '" + HBarCode + "'," + sHWHID + "," + sHSPID+","+ HOWNERID+",'"+ sWhere+"'", "h_p_KF_ICInventoryByMaterIDList");
			@@ -1301,6 +1323,1023 @@
			return objJsonResult;
			}
			}




			#region 白坯发布汇总报表
			public DBUtility.ClsPub.Enum_BillStatus BillStatus;
			//private json objJsonResult = new json();
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//DataSet ds;

			public class MaterOutSumReport
			{
			public DateTime HBeginDate;
			public DateTime HEndDate;
			public string HMaterNumber;
			public string HBillNo;
			public string HProductName;
			public string HProductModel;
			public string RandomSearch;
			}

			#region 白坯发布汇总报表
			[Route("MaterOutSumReport/MaterOutSumReport_Cloth")]
			[HttpGet]
			public object MaterOutSumReport_Cloth(string sWhere)
			{
			try
			{
			//反序列化传递的值
			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.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");

			//获取列名
			List<object> columnNameList = new List<object>();
			//添加列名
			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); //列中最长数据的长度
			// }

			//}
			//colLen = (headLen >= colLen) ? headLen : colLen;
			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("MaterOutEntryReport/MaterOutEntryReport_Cloth")]
			[HttpGet]
			public object MaterOutEntryReport_Cloth(string sWhere)
			{
			try
			{
			//反序列化传递的值
			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.HProductName + "'' or ''" + com.HProductName + "''='''') " +
			"and (规格型号=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch;

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

			DataTable dt = ds.Tables[0];

			//获取列名
			List<object> columnNameList = new List<object>();
			//添加列名
			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); //列中最长数据的长度
			// }

			//}
			//colLen = (headLen >= colLen) ? headLen : colLen;
			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 染厂汇总报表

			#region 染厂汇总报表
			[Route("ProdProcessSumReport/ProdProcessSumReport_DyeColor")]
			[HttpGet]
			public object ProdProcessSumReport_DyeColor(string sWhere)
			{
			try
			{
			//反序列化传递的值
			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.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");

			//获取列名
			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("ProdProcessEntryReport/ProdProcessEntryReport_DyeColor")]
			[HttpGet]
			public object ProdProcessEntryReport_DyeColor(string sWhere,string sProcessNo)
			{
			try
			{
			//反序列化传递的值
			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.HProductName + "'' or ''" + com.HProductName + "''='''') " +
			"and (产品规格=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " +
			"and (流转卡号=''" + sProcessNo + "'' or ''"+ sProcessNo + "''= '''')" + com.RandomSearch;

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

			//获取列名
			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/ProdProcessSumReport_DyeColor_third")]
			[HttpGet]
			public object ProdProcessSumReport_DyeColor_third(string sWhere)
			{
			try
			{
			//反序列化传递的值
			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.HProductName + "'' or ''" + com.HProductName + "''='''') " +
			"and (产品规格=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch;

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

			//获取列名
			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_DryFinalizeOutReport")]
			[HttpGet]
			public object Kf_DryFinalizeOutReport(string sWhere)
			{
			try
			{
			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)
			{
			try
			{
			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)
			{
			try
			{
			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)
			{
			try
			{
			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)
			{
			try
			{
			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


			#endregion

			#region (生产订单维度)客户订单报表
			[Route("MaterOutEntryReport/sc_ICOMReportList")]
			[HttpGet]
			public object sc_ICOMReportList(string sWhere,string HBeginDate,string HEndDate)
			{
			try
			{
			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_ICOMRKReport")]
			[HttpGet]
			public object sc_ICOMRKReport(string sWhere)
			{
			try
			{
			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 生产入库报表
			[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; }
			}
			[Route("MaterOutEntryReport/SC_DayRkReport")]
			[HttpGet]
			public object SC_DayRkReport(string sWhere,int num)
			{
			try
			{
			DayRkReport DayRkReportList = JsonConvert.DeserializeObject<DayRkReport>(sWhere);

			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; }
			}
			[Route("MaterOutEntryReport/SemiFinishedProductsReportList")]
			[HttpGet]
			public object SemiFinishedProductsReportList(string sWhere, int num)
			{
			try
			{
			SemiFinishedProductsReport DayRkReportList = JsonConvert.DeserializeObject<SemiFinishedProductsReport>(sWhere);

			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)
			{
			try
			{
			string sql1 = string.Format("select hitemid,hnumber,hname from Gy_Source where HUSEORGID="+ HOrgid + " 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)
			{
			try
			{
			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

			#endregion

			}
			}