~yxj/MES-WEB-API.git

			@@ -1361,20 +1361,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列对象的列名
			}

			@@ -1422,20 +1422,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列对象的列名
			}

			@@ -1520,7 +1520,7 @@
			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 + "''='''') " +
			@@ -1560,6 +1560,56 @@



			#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




			#endregion