MES-WEB-API.git

			@@ -132,6 +132,92 @@
			}
			}

			#region 工序流转卡下查
			/// <summary>
			/// </summary>
			/// <param name="HInterID">单据ID</param>
			/// <returns></returns>
			[Route("LEMS/MES_Sc_ProcessExchangeBillQuery_LookDown")]
			[HttpGet]
			public object MES_Sc_ProcessExchangeBillQuery_LookDown(int HInterID)
			{
			DataSet ds;
			try
			{
			List<object> columnNameListSum = new List<object>();
			List<object> columnNameList0 = new List<object>();
			List<object> columnNameList1 = new List<object>();
			List<object> columnNameList2 = new List<object>();
			List<object> columnNameList3 = new List<object>();
			//List<object> columnNameList4 = new List<object>();

			string sql = "exec h_p_Sc_ProcessExchangeBillList_LookDown " + HInterID;
			ds = oCN.RunProcReturn(sql, "h_p_Sc_ProcessExchangeBillList_LookDown");

			//添加工序进站接收单列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList0.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			//添加工序出站汇报单列名
			foreach (DataColumn col in ds.Tables[1].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList1.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			//添加指引卡开工单列名
			foreach (DataColumn col in ds.Tables[2].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList2.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			//添加指引卡完工单列名
			foreach (DataColumn col in ds.Tables[3].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList3.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			////添加工序流转卡列名
			//foreach (DataColumn col in ds.Tables[4].Columns)
			//{
			// Type dataType = col.DataType;
			// string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			// columnNameList4.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			//}

			columnNameListSum.Add(columnNameList0);
			columnNameListSum.Add(columnNameList1);
			columnNameListSum.Add(columnNameList2);
			columnNameListSum.Add(columnNameList3);
			//columnNameListSum.Add(columnNameList4);

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


			/// <summary>
			/// 工序流转卡只显示工序染厂的数据
			@@ -486,6 +572,7 @@

			//获取系统参数
			string Ret = "";
			string Count = "";
			if (oSystemParameter.ShowBill(ref Ret))
			{
			//判断客户为龙山汽配
			@@ -496,10 +583,16 @@

			sWhere += sql_splice;
			}
			//判断客户为瑞与祺
			if (oSystemParameter.omodel.WMS_CampanyName == "瑞与祺")
			{
			Count = "top 1000";
			}
			}


			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeIssueBillQuery where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeIssueBillQuery");
			ds = oCN.RunProcReturn("select " + Count + " * from h_v_Sc_ProcessExchangeIssueBillQuery where 1 = 1 " + sWhere + " order by hmainid desc,CONVERT(int,流水号) asc", "h_v_Sc_ProcessExchangeIssueBillQuery");
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			@@ -1215,6 +1308,198 @@
			return GetObjectJson(ds);
			}

			#region 生产订单下查
			/// <summary>
			/// </summary>
			/// <param name="HInterID">单据ID</param>
			/// <returns></returns>
			[Route("LEMS/MES_IF_ICMOBillList_Json_LookDown")]
			[HttpGet]
			public object MES_IF_ICMOBillList_Json_LookDown(int HInterID)
			{
			DataSet ds;
			try
			{
			List<object> columnNameListSum = new List<object>();
			List<object> columnNameList0 = new List<object>();
			List<object> columnNameList1 = new List<object>();
			List<object> columnNameList2 = new List<object>();
			List<object> columnNameList3 = new List<object>();
			List<object> columnNameList4 = new List<object>();
			List<object> columnNameList5 = new List<object>();

			string sql = "exec h_p_Sc_ICMOBillList_LookDown " + HInterID;
			ds = oCN.RunProcReturn(sql, "h_p_Xs_SeOrderBill_lookdown");

			//添加工序进站接收单列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList0.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			//添加工序出站汇报单列名
			foreach (DataColumn col in ds.Tables[1].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList1.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			//添加指引卡开工单列名
			foreach (DataColumn col in ds.Tables[2].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList2.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			//添加指引卡完工单列名
			foreach (DataColumn col in ds.Tables[3].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList3.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			//添加工序流转卡列名
			foreach (DataColumn col in ds.Tables[4].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList4.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			//添加生产领料单列名
			foreach (DataColumn col in ds.Tables[5].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList5.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			columnNameListSum.Add(columnNameList0);
			columnNameListSum.Add(columnNameList1);
			columnNameListSum.Add(columnNameList2);
			columnNameListSum.Add(columnNameList3);
			columnNameListSum.Add(columnNameList4);
			columnNameListSum.Add(columnNameList5);

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

			#region 生产分析报表
			[Route("LEMS/ProductionAnalysisReportList")]
			[HttpGet]
			public object ProductionAnalysisReportList(string DateYear, string HType, string user)
			{
			try
			{
			DataSet ds;
			List<object> columnNameList = new List<object>();

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

			//添加列名
			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("LEMS/SeOutReportList")]
			[HttpGet]
			public object SeOutReportList(string DateYear, string HType, string user)
			{
			try
			{
			DataSet ds;
			List<object> columnNameList = new List<object>();

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

			//添加列名
			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("LEMS/sc_ICOMReportClose")]
			[HttpPost]