JTAPI.git - Gitblit

			@@ -11,7 +11,7 @@
			{
			[RoutePrefix(prefix: "api/ReportManager")]
			[ControllerGroup("报表管理", "在线接口")]
			//[ChannelActionFilter]
			[ChannelActionFilter]
			public class ReportManagerController : ApiController
			{
			//定义全局信息返回变量
			@@ -98,6 +98,7 @@
			/// <param name="groupcode">生产班组</param>
			/// <param name="username">操作人员</param>
			/// <param name="operdate">操作时间</param>
			/// <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
			/// <param name="page">页码</param>
			/// <param name="rows">每页显示条数</param>
			/// <param name="prop">排序字段</param>
			@@ -105,7 +106,7 @@
			/// <returns></returns>
			[Route(template: "GroupSalaryReportSearch")]
			[HttpGet]
			public HttpResponseMessage GroupSalaryReportSearch(int page, int rows, string prop, string order,string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)
			public HttpResponseMessage GroupSalaryReportSearch(int page, int rows, string prop, string order,string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null,string rejectstepcode=null)
			{
			string operopendate = ""; //报工开始时间
			string operclosedate = ""; //报工结束时间
			@@ -116,7 +117,7 @@
			}
			int startNum = rows * (page - 1) + 1; //起始记录rowNum
			int endNum = rows * page; //结束记录 rowNum
			mes = ReportManagerBLL.GroupSalaryReportSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, startNum, endNum, prop, order);
			mes = ReportManagerBLL.GroupSalaryReportSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode, startNum, endNum, prop, order);
			return TJson.toJson(mes);
			}
			#endregion
			@@ -149,10 +150,11 @@
			/// <param name="groupcode">生产班组</param>
			/// <param name="username">操作人员</param>
			/// <param name="operdate">操作时间</param>
			/// <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
			/// <returns></returns>
			[Route(template: "GroupSalaryReportExcelSearch")]
			[HttpGet]
			public HttpResponseMessage GroupSalaryReportExcelSearch(string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)
			public HttpResponseMessage GroupSalaryReportExcelSearch(string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null,string rejectstepcode=null)
			{
			string operopendate = ""; //报工开始时间
			string operclosedate = ""; //报工结束时间
			@@ -161,7 +163,7 @@
			operopendate = operdate.Split('~')[0].ToString();
			operclosedate = operdate.Split('~')[1].ToString();
			}
			mes = ReportManagerBLL.GroupSalaryReportExcelSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate);
			mes = ReportManagerBLL.GroupSalaryReportExcelSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);
			return TJson.toJson(mes);
			}
			#endregion
			@@ -180,6 +182,7 @@
			/// <param name="groupcode">生产班组</param>
			/// <param name="reportname">报工人员</param>
			/// <param name="reportdate">报工时间</param>
			/// <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
			/// <param name="page">页码</param>
			/// <param name="rows">每页显示条数</param>
			/// <param name="prop">排序字段</param>
			@@ -187,7 +190,7 @@
			/// <returns></returns>
			[Route(template: "PeopleSalaryReportSearch")]
			[HttpGet]
			public HttpResponseMessage PeopleSalaryReportSearch(int page, int rows, string prop, string order,string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string reportname = null, string reportdate = null)
			public HttpResponseMessage PeopleSalaryReportSearch(int page, int rows, string prop, string order,string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string reportname = null, string reportdate = null,string rejectstepcode=null)
			{
			string reportopendate = ""; //报工开始时间
			string reportclosedate = ""; //报工结束时间
			@@ -198,7 +201,7 @@
			}
			int startNum = rows * (page - 1) + 1; //起始记录rowNum
			int endNum = rows * page; //结束记录 rowNum
			mes = ReportManagerBLL.PeopleSalaryReportSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
			mes = ReportManagerBLL.PeopleSalaryReportSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode, startNum, endNum, prop, order);
			return TJson.toJson(mes);
			}
			#endregion
			@@ -216,10 +219,11 @@
			/// <param name="groupcode">生产班组</param>
			/// <param name="reportname">报工人员</param>
			/// <param name="reportdate">报工时间</param>
			/// <param name="rejectstepcode">剔除工序(固定薪资工序不参与计算)</param>
			/// <returns></returns>
			[Route(template: "PeopleSalaryReportExcelSearch")]
			[HttpGet]
			public HttpResponseMessage PeopleSalaryReportExcelSearch(string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string reportname = null, string reportdate = null)
			public HttpResponseMessage PeopleSalaryReportExcelSearch(string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string reportname = null, string reportdate = null,string rejectstepcode=null)
			{
			string reportopendate = ""; //报工开始时间
			string reportclosedate = ""; //报工结束时间
			@@ -228,7 +232,7 @@
			reportopendate = reportdate.Split('~')[0].ToString();
			reportclosedate = reportdate.Split('~')[1].ToString();
			}
			mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate);
			mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode);
			return TJson.toJson(mes);
			}
			#endregion