MES-WEB-API.git

			@@ -1766,10 +1766,10 @@
			}
			#endregion

			#region 返回工序出站汇报单列表-分页
			#region 返回工序出站汇报单列表
			[Route("Cj_StationOutBill/get_Display_Eng")]
			[HttpGet]
			public object get_Display_Eng(string sWhere, string user, string Organization, int page, int size, string HBillSubType)
			public object get_Display_Eng(string sWhere, string user, string HBillSubType)
			{
			try
			{
			@@ -1825,15 +1825,15 @@
			}
			}

			//sWhere = sWhere.Replace("'", "''");

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList_Eng " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_MES_StationOutBillList_Eng");
			ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_Eng where 1 = 1" + sWhere + "order by hmainid desc", "h_v_MES_StationOutBillList");
			}
			else
			{
			ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList_Eng " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_MES_StationOutBillList_Eng");
			string sql1 = "select * from h_v_MES_StationOutBillList_Eng where 1 = 1 ";
			string sql = sql1 + sWhere + " order by hmainid desc";
			ds = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList_Eng");
			}

			//添加列名
			@@ -1844,12 +1844,23 @@
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
			objJsonResult.count = 1;
			objJsonResult.Message = "[0000-1-037]Sucess！";
			objJsonResult.list = columnNameList;
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			//}
			//else
			//{
			//objJsonResult.code = "0";
			//objJsonResult.count = 0;
			//objJsonResult.Message = "无数据";
			//objJsonResult.data = null;
			//return objJsonResult;
			//}
			}
			catch (Exception e)
			{
			@@ -2921,7 +2932,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-1-025]成功:" + j + "行,第" + (i + 1) + "行:审核失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}