From 5b4fb9c56426b5096555560a44dd365b02853ad4 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期六, 17 六月 2023 13:14:54 +0800
Subject: [PATCH] 代码加组织过滤
---
VueWebApi/Controllers/ReportManagerController.cs | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/VueWebApi/Controllers/ReportManagerController.cs b/VueWebApi/Controllers/ReportManagerController.cs
index 60100a0..1090f4b 100644
--- a/VueWebApi/Controllers/ReportManagerController.cs
+++ b/VueWebApi/Controllers/ReportManagerController.cs
@@ -23,6 +23,7 @@
/// <summary>
/// 濮斿鎶ヨ〃璁板綍鏌ヨ
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -38,7 +39,7 @@
/// <returns></returns>
[Route(template: "OutSourceReportSearch")]
[HttpGet]
- public HttpResponseMessage OutSourceReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null,string receivdate=null)
+ public HttpResponseMessage OutSourceReportSearch(int page, int rows, string prop, string order,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null,string receivdate=null)
{
string receivopendate = ""; //鏀舵枡寮�濮嬫椂闂�
string receivclosedate = ""; //鏀舵枡缁撴潫鏃堕棿
@@ -49,7 +50,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.OutSourceReportSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.OutSourceReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -58,6 +59,7 @@
/// <summary>
/// 濮斿鎶ヨ〃璁板綍瀵煎嚭
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -69,7 +71,7 @@
/// <returns></returns>
[Route(template: "OutSourceReportExcelSearch")]
[HttpGet]
- public HttpResponseMessage OutSourceReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null, string receivdate = null)
+ public HttpResponseMessage OutSourceReportExcelSearch(string wkshopcode = null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null, string receivdate = null)
{
string receivopendate = ""; //鏀舵枡寮�濮嬫椂闂�
string receivclosedate = ""; //鏀舵枡缁撴潫鏃堕棿
@@ -78,7 +80,7 @@
receivopendate = receivdate.Split('~')[0].ToString();
receivclosedate = receivdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.OutSourceReportExcelSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
+ mes = ReportManagerBLL.OutSourceReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
return TJson.toJson(mes);
}
#endregion
@@ -89,6 +91,7 @@
/// <summary>
/// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
/// </summary>
+ /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
@@ -106,7 +109,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,string rejectstepcode=null)
+ public HttpResponseMessage GroupSalaryReportSearch(int page, int rows, string prop, string order, string compute, string wkshopcode = null, 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 = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -117,7 +120,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, rejectstepcode, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.GroupSalaryReportSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -141,6 +144,7 @@
/// <summary>
/// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
/// </summary>
+ /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
@@ -154,7 +158,7 @@
/// <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,string rejectstepcode=null)
+ public HttpResponseMessage GroupSalaryReportExcelSearch(string compute, string wkshopcode = null, 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 = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -163,7 +167,7 @@
operopendate = operdate.Split('~')[0].ToString();
operclosedate = operdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.GroupSalaryReportExcelSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);
+ mes = ReportManagerBLL.GroupSalaryReportExcelSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);
return TJson.toJson(mes);
}
#endregion
@@ -173,6 +177,7 @@
/// <summary>
/// 浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃
/// </summary>
+ /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
@@ -190,7 +195,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,string rejectstepcode=null)
+ public HttpResponseMessage PeopleSalaryReportSearch(int page, int rows, string prop, string order,string compute, string wkshopcode = null, 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 = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -201,7 +206,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, rejectstepcode, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.PeopleSalaryReportSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -210,6 +215,7 @@
/// <summary>
/// 浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭
/// </summary>
+ /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
@@ -223,7 +229,7 @@
/// <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,string rejectstepcode=null)
+ public HttpResponseMessage PeopleSalaryReportExcelSearch(string compute, string wkshopcode = null, 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 = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -232,7 +238,7 @@
reportopendate = reportdate.Split('~')[0].ToString();
reportclosedate = reportdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(compute,wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode);
+ mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode);
return TJson.toJson(mes);
}
#endregion
@@ -242,6 +248,7 @@
/// <summary>
/// 涓嶈壇鏄庣粏鎶ヨ〃
/// </summary>
+ /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -258,7 +265,7 @@
/// <returns></returns>
[Route(template: "DefectDetailsReportSearch")]
[HttpGet]
- public HttpResponseMessage DefectDetailsReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null,string defectcode=null,string defectname=null, string reportname = null, string reportdate = null)
+ public HttpResponseMessage DefectDetailsReportSearch(int page, int rows, string prop, string order,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null,string defectcode=null,string defectname=null, string reportname = null, string reportdate = null)
{
string reportopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -269,7 +276,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.DefectDetailsReportSearch(wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.DefectDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -278,6 +285,7 @@
/// <summary>
/// 涓嶈壇鏄庣粏鎶ヨ〃瀵煎嚭
/// </summary>
+ /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -290,7 +298,7 @@
/// <returns></returns>
[Route(template: "DefectDetailsReportExcelSearch")]
[HttpGet]
- public HttpResponseMessage DefectDetailsReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string defectcode = null, string defectname = null, string reportname = null, string reportdate = null)
+ public HttpResponseMessage DefectDetailsReportExcelSearch(string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string defectcode = null, string defectname = null, string reportname = null, string reportdate = null)
{
string reportopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -299,7 +307,7 @@
reportopendate = reportdate.Split('~')[0].ToString();
reportclosedate = reportdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.DefectDetailsReportExcelSearch(wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
+ mes = ReportManagerBLL.DefectDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
return TJson.toJson(mes);
}
#endregion
@@ -324,6 +332,7 @@
/// <summary>
/// 缁翠慨鏄庣粏鎶ヨ〃
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栧彿</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -340,7 +349,7 @@
/// <returns></returns>
[Route(template: "MaintenanceDetailsReportSearch")]
[HttpGet]
- public HttpResponseMessage MaintenanceDetailsReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string style = null, string defectname = null, string repairname = null, string repairdate = null)
+ public HttpResponseMessage MaintenanceDetailsReportSearch(int page, int rows, string prop, string order,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string style = null, string defectname = null, string repairname = null, string repairdate = null)
{
string repairopendate = ""; //缁翠慨寮�濮嬫椂闂�
string repairclosedate = ""; //缁翠慨缁撴潫鏃堕棿
@@ -351,7 +360,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.MaintenanceDetailsReportSearch(wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.MaintenanceDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -360,6 +369,7 @@
/// <summary>
/// 缁翠慨鏄庣粏鎶ヨ〃瀵煎嚭
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栧彿</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -372,7 +382,7 @@
/// <returns></returns>
[Route(template: "MaintenanceDetailsReportExcelSearch")]
[HttpGet]
- public HttpResponseMessage MaintenanceDetailsReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string style = null, string defectname = null, string repairname = null, string repairdate = null)
+ public HttpResponseMessage MaintenanceDetailsReportExcelSearch(string wkshopcode = null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string style = null, string defectname = null, string repairname = null, string repairdate = null)
{
string repairopendate = ""; //缁翠慨寮�濮嬫椂闂�
string repairclosedate = ""; //缁翠慨缁撴潫鏃堕棿
@@ -381,7 +391,7 @@
repairopendate = repairdate.Split('~')[0].ToString();
repairclosedate = repairdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.MaintenanceDetailsReportExcelSearch(wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
+ mes = ReportManagerBLL.MaintenanceDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
return TJson.toJson(mes);
}
#endregion
@@ -596,6 +606,7 @@
/// <summary>
/// 鐢熶骇杩涘害鎶ヨ〃
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="status">宸ュ崟鐘舵��</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
@@ -611,7 +622,7 @@
/// <returns></returns>
[Route(template: "ProductionScheduleReportSearch")]
[HttpGet]
- public HttpResponseMessage ProductionScheduleReportSearch(int page, int rows, string prop, string order,string status=null, string wocode = null, string routecode = null, string routename = null, string partcode = null, string partname = null, string partspec = null,string lm_date=null)
+ public HttpResponseMessage ProductionScheduleReportSearch(int page, int rows, string prop, string order, string wkshopcode=null, string status=null, string wocode = null, string routecode = null, string routename = null, string partcode = null, string partname = null, string partspec = null,string lm_date=null)
{
string opendate = ""; //寮�濮嬫椂闂�
string closedate = ""; //缁撴潫鏃堕棿
@@ -622,7 +633,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.ProductionScheduleReportSearch(status,wocode, routecode, routename, partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.ProductionScheduleReportSearch(wkshopcode,status, wocode, routecode, routename, partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -631,6 +642,7 @@
/// <summary>
/// 鐢熶骇杩涘害鎶ヨ〃瀵煎嚭
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="status">宸ュ崟鐘舵��</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
@@ -642,7 +654,7 @@
/// <returns></returns>
[Route(template: "ProductionScheduleReportExcelSearch")]
[HttpGet]
- public HttpResponseMessage ProductionScheduleReportExcelSearch(string status = null, string wocode = null, string routecode = null, string routename = null, string partcode = null, string partname = null, string partspec = null, string lm_date = null)
+ public HttpResponseMessage ProductionScheduleReportExcelSearch(string wkshopcode=null, string status = null, string wocode = null, string routecode = null, string routename = null, string partcode = null, string partname = null, string partspec = null, string lm_date = null)
{
string opendate = ""; //寮�濮嬫椂闂�
string closedate = ""; //缁撴潫鏃堕棿
@@ -651,7 +663,7 @@
opendate = lm_date.Split('~')[0].ToString();
closedate = lm_date.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.ProductionScheduleReportExcelSearch(status,wocode, routecode, routename, partcode, partname, partspec, opendate, closedate);
+ mes = ReportManagerBLL.ProductionScheduleReportExcelSearch(wkshopcode,status, wocode, routecode, routename, partcode, partname, partspec, opendate, closedate);
return TJson.toJson(mes);
}
#endregion
--
Gitblit v1.9.3