MES-WEB-API.git

			@@ -2,6 +2,7 @@
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using Pub_Class;
			using SyntacticSugar.constant;
			using System;
			using System.Collections;
			using System.Collections.Generic;
			@@ -225,7 +226,7 @@
			if (oSystemParameter.ShowBill(ref Ret))
			{
			//判断客户不为龙山汽配
			if (oSystemParameter.omodel.WMS_CampanyName != "龙山汽配" && oSystemParameter.omodel.WMS_CampanyName != "瑞与祺") //系统参数
			if (oSystemParameter.omodel.WMS_CampanyName != "龙山汽配" && oSystemParameter.omodel.WMS_CampanyName != "瑞与祺" && oSystemParameter.omodel.WMS_CampanyName != "添康科技") //系统参数
			{
			if (HSourceID == 0)
			{
			@@ -1715,6 +1716,58 @@
			}
			#endregion

			#region 工序出站汇报单列表
			[Route("Cj_StationOutBill/page")]
			[HttpGet]
			public json page(string sWhere, string user, int page, int size)
			{
			json res = new json();
			try
			{
			List<object> columnNameList = new List<object>();
			//判断是否有查询权限
			if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
			{
			res.code = "0";
			res.count = 0;
			res.Message = "出站单无查询权限!";
			res.data = null;
			return res;
			}
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",''", "h_p_MES_StationOutBillList");
			}
			else
			{
			ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_MES_StationOutBillList");
			}

			//添加列名
			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列对象的列名
			}

			res.code = CodeConstant.SUCCEED;
			res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
			res.Message = "Sucess！";
			res.list = columnNameList;
			res.data = ds.Tables[0];
			return res;
			}
			catch (Exception e)
			{
			res.code = CodeConstant.FAIL;
			res.count = CountConstant.FAIL;
			res.Message = "Exception！" + e.ToString();
			res.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#region 工序出站汇报单子表查询
			[Route("Cj_StationOutBill/get_SubDisplay")]
			[HttpGet]