From 3e9b79b84905b1cf7a282d1bf03e6de3e85b91bb Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 02 十一月 2023 15:52:22 +0800
Subject: [PATCH] 1.生产开报工、报表增加销售订单号查询字段及列表字段
---
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 1090f4b..9228fe7 100644
--- a/VueWebApi/Controllers/ReportManagerController.cs
+++ b/VueWebApi/Controllers/ReportManagerController.cs
@@ -25,6 +25,7 @@
/// </summary>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="saleordercode">閿�鍞鍗曞彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -39,7 +40,7 @@
/// <returns></returns>
[Route(template: "OutSourceReportSearch")]
[HttpGet]
- 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)
+ public HttpResponseMessage OutSourceReportSearch(int page, int rows, string prop, string order,string wkshopcode=null, string wocode = null,string saleordercode=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 = ""; //鏀舵枡缁撴潫鏃堕棿
@@ -50,7 +51,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.OutSourceReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.OutSourceReportSearch(wkshopcode,wocode, saleordercode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -61,6 +62,7 @@
/// </summary>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="saleordercode">閿�鍞鍗曞彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -71,7 +73,7 @@
/// <returns></returns>
[Route(template: "OutSourceReportExcelSearch")]
[HttpGet]
- 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)
+ public HttpResponseMessage OutSourceReportExcelSearch(string wkshopcode = null, string wocode = null,string saleordercode=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 = ""; //鏀舵枡缁撴潫鏃堕棿
@@ -80,7 +82,7 @@
receivopendate = receivdate.Split('~')[0].ToString();
receivclosedate = receivdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.OutSourceReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
+ mes = ReportManagerBLL.OutSourceReportExcelSearch(wkshopcode,wocode, saleordercode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
return TJson.toJson(mes);
}
#endregion
@@ -94,6 +96,7 @@
/// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="saleordercode">閿�鍞鍗曞彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -109,7 +112,7 @@
/// <returns></returns>
[Route(template: "GroupSalaryReportSearch")]
[HttpGet]
- 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)
+ public HttpResponseMessage GroupSalaryReportSearch(int page, int rows, string prop, string order, string compute, string wkshopcode = null, string wocode = null,string saleordercode=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 = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -120,7 +123,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.GroupSalaryReportSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.GroupSalaryReportSearch(wkshopcode,compute, wocode, saleordercode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -147,6 +150,7 @@
/// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="saleordercode">閿�鍞鍗曞彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -158,7 +162,7 @@
/// <returns></returns>
[Route(template: "GroupSalaryReportExcelSearch")]
[HttpGet]
- 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)
+ public HttpResponseMessage GroupSalaryReportExcelSearch(string compute, string wkshopcode = null, string wocode = null,string saleordercode=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 = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -167,7 +171,7 @@
operopendate = operdate.Split('~')[0].ToString();
operclosedate = operdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.GroupSalaryReportExcelSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);
+ mes = ReportManagerBLL.GroupSalaryReportExcelSearch(wkshopcode,compute, wocode, saleordercode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);
return TJson.toJson(mes);
}
#endregion
@@ -180,6 +184,7 @@
/// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="saleordercode">閿�鍞鍗曞彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -195,7 +200,7 @@
/// <returns></returns>
[Route(template: "PeopleSalaryReportSearch")]
[HttpGet]
- 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)
+ public HttpResponseMessage PeopleSalaryReportSearch(int page, int rows, string prop, string order,string compute, string wkshopcode = null, string wocode = null,string saleordercode=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 = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -206,7 +211,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.PeopleSalaryReportSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.PeopleSalaryReportSearch(wkshopcode,compute, wocode, saleordercode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -218,6 +223,7 @@
/// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="saleordercode">閿�鍞鍗曞彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -229,7 +235,7 @@
/// <returns></returns>
[Route(template: "PeopleSalaryReportExcelSearch")]
[HttpGet]
- 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)
+ public HttpResponseMessage PeopleSalaryReportExcelSearch(string compute, string wkshopcode = null, string wocode = null,string saleordercode=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 = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -238,7 +244,7 @@
reportopendate = reportdate.Split('~')[0].ToString();
reportclosedate = reportdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode);
+ mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(wkshopcode,compute, wocode, saleordercode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode);
return TJson.toJson(mes);
}
#endregion
@@ -250,6 +256,7 @@
/// </summary>
/// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="saleordercode">閿�鍞鍗曞彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -265,7 +272,7 @@
/// <returns></returns>
[Route(template: "DefectDetailsReportSearch")]
[HttpGet]
- 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)
+ public HttpResponseMessage DefectDetailsReportSearch(int page, int rows, string prop, string order,string wkshopcode=null, string wocode = null,string saleordercode=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 = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -276,7 +283,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.DefectDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.DefectDetailsReportSearch(wkshopcode,wocode, saleordercode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -287,6 +294,7 @@
/// </summary>
/// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="saleordercode">閿�鍞鍗曞彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -298,7 +306,7 @@
/// <returns></returns>
[Route(template: "DefectDetailsReportExcelSearch")]
[HttpGet]
- 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)
+ public HttpResponseMessage DefectDetailsReportExcelSearch(string wkshopcode=null, string wocode = null,string saleordercode=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 = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -307,7 +315,7 @@
reportopendate = reportdate.Split('~')[0].ToString();
reportclosedate = reportdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.DefectDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
+ mes = ReportManagerBLL.DefectDetailsReportExcelSearch(wkshopcode,wocode, saleordercode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
return TJson.toJson(mes);
}
#endregion
@@ -334,6 +342,7 @@
/// </summary>
/// <param name="wkshopcode">杞﹂棿缂栧彿</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="saleordercode">閿�鍞鍗曞彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -349,7 +358,7 @@
/// <returns></returns>
[Route(template: "MaintenanceDetailsReportSearch")]
[HttpGet]
- 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)
+ public HttpResponseMessage MaintenanceDetailsReportSearch(int page, int rows, string prop, string order,string wkshopcode=null, string wocode = null,string saleordercode=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 = ""; //缁翠慨缁撴潫鏃堕棿
@@ -360,7 +369,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.MaintenanceDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.MaintenanceDetailsReportSearch(wkshopcode,wocode, saleordercode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -371,6 +380,7 @@
/// </summary>
/// <param name="wkshopcode">杞﹂棿缂栧彿</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="saleordercode">閿�鍞鍗曞彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -382,7 +392,7 @@
/// <returns></returns>
[Route(template: "MaintenanceDetailsReportExcelSearch")]
[HttpGet]
- 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)
+ public HttpResponseMessage MaintenanceDetailsReportExcelSearch(string wkshopcode = null, string wocode = null,string saleordercode=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 = ""; //缁翠慨缁撴潫鏃堕棿
@@ -391,7 +401,7 @@
repairopendate = repairdate.Split('~')[0].ToString();
repairclosedate = repairdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.MaintenanceDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
+ mes = ReportManagerBLL.MaintenanceDetailsReportExcelSearch(wkshopcode,wocode, saleordercode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
return TJson.toJson(mes);
}
#endregion
@@ -609,6 +619,7 @@
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="status">宸ュ崟鐘舵��</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="saleordercode">閿�鍞鍗曞彿</param>
/// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
/// <param name="routename">宸ヨ壓璺嚎鍚嶇О</param>
/// <param name="partcode">浜у搧缂栫爜</param>
@@ -622,7 +633,7 @@
/// <returns></returns>
[Route(template: "ProductionScheduleReportSearch")]
[HttpGet]
- 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)
+ public HttpResponseMessage ProductionScheduleReportSearch(int page, int rows, string prop, string order, string wkshopcode=null, string status=null, string wocode = null,string saleordercode=null, string routecode = null, string routename = null, string partcode = null, string partname = null, string partspec = null,string lm_date=null)
{
string opendate = ""; //寮�濮嬫椂闂�
string closedate = ""; //缁撴潫鏃堕棿
@@ -633,7 +644,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.ProductionScheduleReportSearch(wkshopcode,status, wocode, routecode, routename, partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.ProductionScheduleReportSearch(wkshopcode,status, wocode, saleordercode, routecode, routename, partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -645,6 +656,7 @@
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="status">宸ュ崟鐘舵��</param>
/// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="saleordercode">閿�鍞鍗曞彿</param>
/// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
/// <param name="routename">宸ヨ壓璺嚎鍚嶇О</param>
/// <param name="partcode">浜у搧缂栫爜</param>
@@ -654,7 +666,7 @@
/// <returns></returns>
[Route(template: "ProductionScheduleReportExcelSearch")]
[HttpGet]
- 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)
+ public HttpResponseMessage ProductionScheduleReportExcelSearch(string wkshopcode=null, string status = null, string wocode = null,string saleordercode=null, string routecode = null, string routename = null, string partcode = null, string partname = null, string partspec = null, string lm_date = null)
{
string opendate = ""; //寮�濮嬫椂闂�
string closedate = ""; //缁撴潫鏃堕棿
@@ -663,7 +675,7 @@
opendate = lm_date.Split('~')[0].ToString();
closedate = lm_date.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.ProductionScheduleReportExcelSearch(wkshopcode,status, wocode, routecode, routename, partcode, partname, partspec, opendate, closedate);
+ mes = ReportManagerBLL.ProductionScheduleReportExcelSearch(wkshopcode,status, wocode, saleordercode, routecode, routename, partcode, partname, partspec, opendate, closedate);
return TJson.toJson(mes);
}
#endregion
--
Gitblit v1.9.3