From 22af5bed0da8a5852bd824a1e21e6fc43df6df2a Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 11 十二月 2023 19:20:43 +0800
Subject: [PATCH] 1.App 智能分析，生产进度看板接口 2.PC端设备点检项目、保养项目、点检标准、保养标准、点检记录、保养记录、维修记录 3.工序检验扫码添加判断(条码任务是否存在、工单是否关闭) 4.添加App图标图片文件

---
 VueWebCoreApi/Controllers/ReportManagerController.cs |  374 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 365 insertions(+), 9 deletions(-)

diff --git a/VueWebCoreApi/Controllers/ReportManagerController.cs b/VueWebCoreApi/Controllers/ReportManagerController.cs
index 12653d6..17ed30b 100644
--- a/VueWebCoreApi/Controllers/ReportManagerController.cs
+++ b/VueWebCoreApi/Controllers/ReportManagerController.cs
@@ -12,7 +12,7 @@
     [ApiExplorerSettings(GroupName = "缁熻鎶ヨ〃")]
     [ApiController]
     [Route("api/[controller]")]
-    //[ChannelActionFilter]
+    [ChannelActionFilter]
     public class ReportManagerController : Controller
     {
         //瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -24,9 +24,8 @@
         /// 鐢熶骇杩涘害鎶ヨ〃
         /// </summary>
         /// <param name="status">宸ュ崟鐘舵��</param>
+        /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
         /// <param name="wocode">宸ュ崟缂栧彿</param>
-        /// /// <param name="wkshopcode">杞﹂棿缂栧彿</param>
-        /// /// <param name="wkshopname">杞﹂棿鍚嶇О</param>
         /// <param name="partcode">浜у搧缂栫爜</param>
         /// <param name="partname">浜у搧鍚嶇О</param>
         /// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -38,7 +37,7 @@
         /// <returns></returns>
         [Route(template: "ProductionScheduleReportSearch")]
         [HttpGet]
-        public JsonResult ProductionScheduleReportSearch(int page, int rows, string prop, string order, string status = null, string wocode = null,string wkshopcode=null,string wkshopname=null, string partcode = null, string partname = null, string partspec = null, string lm_date = null)
+        public JsonResult ProductionScheduleReportSearch(int page, int rows, string prop, string order, string status = null, string wocode = null,string wkshopcode=null, string partcode = null, string partname = null, string partspec = null, string lm_date = null)
         {
             string opendate = "";     //寮�濮嬫椂闂�
             string closedate = "";    //缁撴潫鏃堕棿
@@ -49,7 +48,7 @@
             }
             int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
             int endNum = rows * page;   //缁撴潫璁板綍 rowNum
-            mes = ReportManagerBLL.ProductionScheduleReportSearch(status, wocode, wkshopcode,wkshopname, partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
+            mes = ReportManagerBLL.ProductionScheduleReportSearch(status, wkshopcode, wocode,partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
             return Json(mes);
         }
         #endregion
@@ -59,9 +58,8 @@
         /// 鐢熶骇杩涘害鎶ヨ〃瀵煎嚭
         /// </summary>
         /// <param name="status">宸ュ崟鐘舵��</param>
+        /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
         /// <param name="wocode">宸ュ崟缂栧彿</param>
-        /// /// <param name="wkshopcode">杞﹂棿缂栧彿</param>
-        /// /// <param name="wkshopname">杞﹂棿鍚嶇О</param>
         /// <param name="partcode">浜у搧缂栫爜</param>
         /// <param name="partname">浜у搧鍚嶇О</param>
         /// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -69,7 +67,7 @@
         /// <returns></returns>
         [Route(template: "ProductionScheduleReportExcelSearch")]
         [HttpGet]
-        public JsonResult ProductionScheduleReportExcelSearch(string status = null, string wocode = null, string wkshopcode = null, string wkshopname = null, string partcode = null, string partname = null, string partspec = null, string lm_date = null)
+        public JsonResult ProductionScheduleReportExcelSearch(string status = null, string wkshopcode = null, string wocode = null,string partcode = null, string partname = null, string partspec = null, string lm_date = null)
         {
             string opendate = "";     //寮�濮嬫椂闂�
             string closedate = "";    //缁撴潫鏃堕棿
@@ -78,7 +76,365 @@
                 opendate = lm_date.Split('~')[0].ToString();
                 closedate = lm_date.Split('~')[1].ToString();
             }
-            mes = ReportManagerBLL.ProductionScheduleReportExcelSearch(status, wocode, wkshopcode, wkshopname, partcode, partname, partspec, opendate, closedate);
+            mes = ReportManagerBLL.ProductionScheduleReportExcelSearch(status, wkshopcode,wocode, partcode, partname, partspec, opendate, closedate);
+            return Json(mes);
+        }
+        #endregion
+
+
+        #region[鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ]
+        /// <summary>
+        /// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
+        /// </summary>
+        /// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
+        /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
+        /// <param name="wocode">宸ュ崟缂栧彿</param>
+        /// <param name="partcode">浜у搧缂栫爜</param>
+        /// <param name="partname">浜у搧鍚嶇О</param>
+        /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+        /// <param name="stepname">宸ュ簭鍚嶇О</param>
+        /// <param name="groupcode">鐢熶骇鐝粍</param>
+        /// <param name="username">鎿嶄綔浜哄憳</param>
+        /// <param name="operdate">鎿嶄綔鏃堕棿</param>
+        /// <param name="page">椤电爜</param>
+        /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+        /// <param name="prop">鎺掑簭瀛楁</param>
+        /// <param name="order">鎺掑簭瑙勫垯</param>
+        /// <returns></returns>
+        [Route(template: "GroupSalaryReportSearch")]
+        [HttpGet]
+        public JsonResult 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 operopendate = "";  //鎶ュ伐寮�濮嬫椂闂�
+            string operclosedate = "";    //鎶ュ伐缁撴潫鏃堕棿
+            if (operdate != "" && operdate != null)
+            {
+                operopendate = operdate.Split('~')[0].ToString();
+                operclosedate = operdate.Split('~')[1].ToString();
+            }
+            int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
+            int endNum = rows * page;   //缁撴潫璁板綍 rowNum
+            mes = ReportManagerBLL.GroupSalaryReportSearch(compute, wkshopcode, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, startNum, endNum, prop, order);
+            return Json(mes);
+        }
+        #endregion
+
+        #region[鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ョ湅鎶ュ伐浜哄憳]
+        /// <summary>
+        /// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ョ湅鎶ュ伐浜哄憳
+        /// </summary>
+        /// <param name="id">鎶ュ伐璁板綍涓昏〃id</param>
+        /// <returns></returns>
+        [Route(template: "GroupSalaryReportSearchUser")]
+        [HttpGet]
+        public JsonResult GroupSalaryReportSearchUser(string id)
+        {
+            mes = ReportManagerBLL.GroupSalaryReportSearchUser(id);
+            return Json(mes);
+        }
+        #endregion
+
+        #region[鐝粍宸ヨ祫鎶ヨ〃璁板綍瀵煎嚭]
+        /// <summary>
+        /// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
+        /// </summary>
+        /// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
+        /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
+        /// <param name="wocode">宸ュ崟缂栧彿</param>
+        /// <param name="partcode">浜у搧缂栫爜</param>
+        /// <param name="partname">浜у搧鍚嶇О</param>
+        /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+        /// <param name="stepname">宸ュ簭鍚嶇О</param>
+        /// <param name="groupcode">鐢熶骇鐝粍</param>
+        /// <param name="username">鎿嶄綔浜哄憳</param>
+        /// <param name="operdate">鎿嶄綔鏃堕棿</param>
+        /// <returns></returns>
+        [Route(template: "GroupSalaryReportExcelSearch")]
+        [HttpGet]
+        public JsonResult 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 operopendate = "";  //鎶ュ伐寮�濮嬫椂闂�
+            string operclosedate = "";    //鎶ュ伐缁撴潫鏃堕棿
+            if (operdate != "" && operdate != null)
+            {
+                operopendate = operdate.Split('~')[0].ToString();
+                operclosedate = operdate.Split('~')[1].ToString();
+            }
+            mes = ReportManagerBLL.GroupSalaryReportExcelSearch(compute,wkshopcode, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate);
+            return Json(mes);
+        }
+        #endregion
+
+
+        #region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃]
+        /// <summary>
+        /// 浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃
+        /// </summary>
+        /// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
+        /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
+        /// <param name="wocode">宸ュ崟缂栧彿</param>
+        /// <param name="partcode">浜у搧缂栫爜</param>
+        /// <param name="partname">浜у搧鍚嶇О</param>
+        /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+        /// <param name="stepcode">宸ュ簭缂栧彿</param>
+        /// <param name="stepname">宸ュ簭鍚嶇О</param>
+        /// <param name="reportname">鎶ュ伐浜哄憳</param>
+        /// <param name="reportdate">鎶ュ伐鏃堕棿</param>
+        /// <param name="page">椤电爜</param>
+        /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+        /// <param name="prop">鎺掑簭瀛楁</param>
+        /// <param name="order">鎺掑簭瑙勫垯</param>
+        /// <returns></returns>
+        [Route(template: "PeopleSalaryReportSearch")]
+        [HttpGet]
+        public JsonResult 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 stepcode=null, string stepname = null, string reportname = null, string reportdate = null)
+        {
+            string reportopendate = "";  //鎶ュ伐寮�濮嬫椂闂�
+            string reportclosedate = "";    //鎶ュ伐缁撴潫鏃堕棿
+            if (reportdate != "" && reportdate != null)
+            {
+                reportopendate = reportdate.Split('~')[0].ToString();
+                reportclosedate = reportdate.Split('~')[1].ToString();
+            }
+            int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
+            int endNum = rows * page;   //缁撴潫璁板綍 rowNum
+            mes = ReportManagerBLL.PeopleSalaryReportSearch(compute, wkshopcode, wocode, partcode, partname, partspec, stepcode, stepname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
+            return Json(mes);
+        }
+        #endregion
+
+        #region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭]
+        /// <summary>
+        /// 浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭
+        /// </summary>
+        /// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
+        /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
+        /// <param name="wocode">宸ュ崟缂栧彿</param>
+        /// <param name="partcode">浜у搧缂栫爜</param>
+        /// <param name="partname">浜у搧鍚嶇О</param>
+        /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+        /// <param name="stepcode">宸ュ簭缂栧彿</param>
+        /// <param name="stepname">宸ュ簭鍚嶇О</param>
+        /// <param name="reportname">鎶ュ伐浜哄憳</param>
+        /// <param name="reportdate">鎶ュ伐鏃堕棿</param>
+        /// <returns></returns>
+        [Route(template: "PeopleSalaryReportExcelSearch")]
+        [HttpGet]
+        public JsonResult PeopleSalaryReportExcelSearch(string compute,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null,string stepcode=null, string stepname = null, string reportname = null, string reportdate = null)
+        {
+            string reportopendate = "";  //鎶ュ伐寮�濮嬫椂闂�
+            string reportclosedate = "";    //鎶ュ伐缁撴潫鏃堕棿
+            if (reportdate != "" && reportdate != null)
+            {
+                reportopendate = reportdate.Split('~')[0].ToString();
+                reportclosedate = reportdate.Split('~')[1].ToString();
+            }
+            mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(compute, wkshopcode, wocode, partcode, partname, partspec,stepcode,stepname, reportname, reportopendate, reportclosedate);
+            return Json(mes);
+        }
+        #endregion
+
+
+        #region[濮斿鎶ヨ〃璁板綍鏌ヨ]
+        /// <summary>
+        /// 濮斿鎶ヨ〃璁板綍鏌ヨ
+        /// </summary>
+        /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
+        /// <param name="wocode">宸ュ崟缂栧彿</param>
+        /// <param name="partcode">浜у搧缂栫爜</param>
+        /// <param name="partname">浜у搧鍚嶇О</param>
+        /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+        /// <param name="stepname">宸ュ簭鍚嶇О</param>
+        /// <param name="suppername">渚涙柟鍚嶇О</param>
+        /// <param name="type">鎿嶄綔绫诲瀷</param>
+        /// <param name="receivdate">鏀舵枡鏃堕棿</param>
+        /// <param name="page">椤电爜</param>
+        /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+        /// <param name="prop">鎺掑簭瀛楁</param>
+        /// <param name="order">鎺掑簭瑙勫垯</param>
+        /// <returns></returns>
+        [Route(template: "OutSourceReportSearch")]
+        [HttpGet]
+        public JsonResult 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 = "";    //鏀舵枡缁撴潫鏃堕棿
+            if (receivdate != "" && receivdate != null)
+            {
+                receivopendate = receivdate.Split('~')[0].ToString();
+                receivclosedate = receivdate.Split('~')[1].ToString();
+            }
+            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);
+            return Json(mes);
+        }
+        #endregion
+
+        #region[濮斿鎶ヨ〃璁板綍瀵煎嚭]
+        /// <summary>
+        /// 濮斿鎶ヨ〃璁板綍瀵煎嚭
+        /// </summary>
+        /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
+        /// <param name="wocode">宸ュ崟缂栧彿</param>
+        /// <param name="partcode">浜у搧缂栫爜</param>
+        /// <param name="partname">浜у搧鍚嶇О</param>
+        /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+        /// <param name="stepname">宸ュ簭鍚嶇О</param>
+        /// <param name="suppername">渚涙柟鍚嶇О</param>
+        /// <param name="type">鎿嶄綔绫诲瀷</param>
+        /// <param name="receivdate">鏀舵枡鏃堕棿</param>
+        /// <returns></returns>
+        [Route(template: "OutSourceReportExcelSearch")]
+        [HttpGet]
+        public JsonResult 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 = "";    //鏀舵枡缁撴潫鏃堕棿
+            if (receivdate != "" && receivdate != null)
+            {
+                receivopendate = receivdate.Split('~')[0].ToString();
+                receivclosedate = receivdate.Split('~')[1].ToString();
+            }
+            mes = ReportManagerBLL.OutSourceReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
+            return Json(mes);
+        }
+        #endregion
+
+
+        #region[涓嶈壇鏄庣粏鎶ヨ〃]
+        /// <summary>
+        /// 涓嶈壇鏄庣粏鎶ヨ〃 
+        /// </summary>
+        /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
+        /// <param name="wocode">宸ュ崟缂栧彿</param>
+        /// <param name="partcode">浜у搧缂栫爜</param>
+        /// <param name="partname">浜у搧鍚嶇О</param>
+        /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+        /// <param name="stepname">宸ュ簭鍚嶇О</param>
+        /// <param name="defectcode">缂洪櫡浠ｇ爜</param>
+        /// <param name="defectname">缂洪櫡鍚嶇О</param>
+        /// <param name="reportname">鎶ュ伐浜哄憳</param>
+        /// <param name="reportdate">鎶ュ伐鏃堕棿</param>
+        /// <param name="page">椤电爜</param>
+        /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+        /// <param name="prop">鎺掑簭瀛楁</param>
+        /// <param name="order">鎺掑簭瑙勫垯</param>
+        /// <returns></returns>
+        [Route(template: "DefectDetailsReportSearch")]
+        [HttpGet]
+        public JsonResult 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 = "";    //鎶ュ伐缁撴潫鏃堕棿
+            if (reportdate != "" && reportdate != null)
+            {
+                reportopendate = reportdate.Split('~')[0].ToString();
+                reportclosedate = reportdate.Split('~')[1].ToString();
+            }
+            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);
+            return Json(mes);
+        }
+        #endregion
+
+        #region[涓嶈壇鏄庣粏鎶ヨ〃瀵煎嚭]
+        /// <summary>
+        /// 涓嶈壇鏄庣粏鎶ヨ〃瀵煎嚭 
+        /// </summary>
+        /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
+        /// <param name="wocode">宸ュ崟缂栧彿</param>
+        /// <param name="partcode">浜у搧缂栫爜</param>
+        /// <param name="partname">浜у搧鍚嶇О</param>
+        /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+        /// <param name="stepname">宸ュ簭鍚嶇О</param>
+        /// <param name="defectcode">缂洪櫡浠ｇ爜</param>
+        /// <param name="defectname">缂洪櫡鍚嶇О</param>
+        /// <param name="reportname">鎶ュ伐浜哄憳</param>
+        /// <param name="reportdate">鎶ュ伐鏃堕棿</param>
+        /// <returns></returns>
+        [Route(template: "DefectDetailsReportExcelSearch")]
+        [HttpGet]
+        public JsonResult 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 = "";    //鎶ュ伐缁撴潫鏃堕棿
+            if (reportdate != "" && reportdate != null)
+            {
+                reportopendate = reportdate.Split('~')[0].ToString();
+                reportclosedate = reportdate.Split('~')[1].ToString();
+            }
+            mes = ReportManagerBLL.DefectDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
+            return Json(mes);
+        }
+        #endregion
+
+
+        #region[缁翠慨鏄庣粏鎶ヨ〃]
+        /// <summary>
+        /// 缁翠慨鏄庣粏鎶ヨ〃 
+        /// </summary>
+        /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
+        /// <param name="wocode">宸ュ崟缂栧彿</param>
+        /// <param name="partcode">浜у搧缂栫爜</param>
+        /// <param name="partname">浜у搧鍚嶇О</param>
+        /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+        /// <param name="stepname">宸ュ簭鍚嶇О</param>
+        /// <param name="style">鎿嶄綔绫诲瀷</param>
+        /// <param name="defectname">缂洪櫡鍚嶇О</param>
+        /// <param name="repairname">缁翠慨浜哄憳</param>
+        /// <param name="repairdate">缁翠慨鏃堕棿</param>
+        /// <param name="page">椤电爜</param>
+        /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+        /// <param name="prop">鎺掑簭瀛楁</param>
+        /// <param name="order">鎺掑簭瑙勫垯</param>
+        /// <returns></returns>
+        [Route(template: "MaintenanceDetailsReportSearch")]
+        [HttpGet]
+        public JsonResult 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 = "";    //缁翠慨缁撴潫鏃堕棿
+            if (repairdate != "" && repairdate != null)
+            {
+                repairopendate = repairdate.Split('~')[0].ToString();
+                repairclosedate = repairdate.Split('~')[1].ToString();
+            }
+            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);
+            return Json(mes);
+        }
+        #endregion
+
+        #region[缁翠慨鏄庣粏鎶ヨ〃瀵煎嚭]
+        /// <summary>
+        /// 缁翠慨鏄庣粏鎶ヨ〃瀵煎嚭 
+        /// </summary>
+        /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
+        /// <param name="wocode">宸ュ崟缂栧彿</param>
+        /// <param name="partcode">浜у搧缂栫爜</param>
+        /// <param name="partname">浜у搧鍚嶇О</param>
+        /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+        /// <param name="stepname">宸ュ簭鍚嶇О</param>
+        /// <param name="style">鎿嶄綔绫诲瀷</param>
+        /// <param name="defectname">缂洪櫡鍚嶇О</param>
+        /// <param name="repairname">缁翠慨浜哄憳</param>
+        /// <param name="repairdate">缁翠慨鏃堕棿</param>
+        /// <returns></returns>
+        [Route(template: "MaintenanceDetailsReportExcelSearch")]
+        [HttpGet]
+        public JsonResult 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 = "";    //缁翠慨缁撴潫鏃堕棿
+            if (repairdate != "" && repairdate != null)
+            {
+                repairopendate = repairdate.Split('~')[0].ToString();
+                repairclosedate = repairdate.Split('~')[1].ToString();
+            }
+            mes = ReportManagerBLL.MaintenanceDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
             return Json(mes);
         }
         #endregion

--
Gitblit v1.9.3