From 9c634fd767aec36ef97c3a814bf7a29c67d20ee1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 29 三月 2024 10:57:35 +0800
Subject: [PATCH] 修改单据重复显示问题，增加工单源单id关联

---
 VueWebApi/Controllers/ReportManagerController.cs |  575 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 567 insertions(+), 8 deletions(-)

diff --git a/VueWebApi/Controllers/ReportManagerController.cs b/VueWebApi/Controllers/ReportManagerController.cs
index 8be455e..9228fe7 100644
--- a/VueWebApi/Controllers/ReportManagerController.cs
+++ b/VueWebApi/Controllers/ReportManagerController.cs
@@ -23,7 +23,9 @@
         /// <summary>
         /// 濮斿鎶ヨ〃璁板綍鏌ヨ
         /// </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>
@@ -38,7 +40,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 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 = "";    //鏀舵枡缁撴潫鏃堕棿
@@ -49,7 +51,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, saleordercode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
             return TJson.toJson(mes);
         }
         #endregion
@@ -58,7 +60,9 @@
         /// <summary>
         /// 濮斿鎶ヨ〃璁板綍瀵煎嚭
         /// </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>
@@ -69,7 +73,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 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 = "";    //鏀舵枡缁撴潫鏃堕棿
@@ -78,7 +82,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, saleordercode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
             return TJson.toJson(mes);
         }
         #endregion
@@ -89,7 +93,10 @@
         /// <summary>
         /// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
         /// </summary>
+        /// <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>
@@ -97,6 +104,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>
@@ -104,10 +112,10 @@
         /// <returns></returns>
         [Route(template: "GroupSalaryReportSearch")]
         [HttpGet]
-        public HttpResponseMessage GroupSalaryReportSearch(int page, int rows, string prop, string order, 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 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 = "";    //鏀舵枡缁撴潫鏃堕棿
+            string operopendate = "";  //鎶ュ伐寮�濮嬫椂闂�
+            string operclosedate = "";    //鎶ュ伐缁撴潫鏃堕棿
             if (operdate != "" && operdate != null)
             {
                 operopendate = operdate.Split('~')[0].ToString();
@@ -115,10 +123,561 @@
             }
             int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
             int endNum = rows * page;   //缁撴潫璁板綍 rowNum
-            mes = ReportManagerBLL.GroupSalaryReportSearch(wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, 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
 
+        #region[鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ョ湅鎶ュ伐浜哄憳]
+        /// <summary>
+        /// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ョ湅鎶ュ伐浜哄憳
+        /// </summary>
+        /// <param name="id">鎶ュ伐璁板綍涓昏〃id</param>
+        /// <returns></returns>
+        [Route(template: "GroupSalaryReportSearchUser")]
+        [HttpGet]
+        public HttpResponseMessage GroupSalaryReportSearchUser(string id)
+        {
+            mes = ReportManagerBLL.GroupSalaryReportSearchUser(id);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[鐝粍宸ヨ祫鎶ヨ〃璁板綍瀵煎嚭]
+        /// <summary>
+        /// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
+        /// </summary>
+        /// <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>
+        /// <param name="stepname">宸ュ簭鍚嶇О</param>
+        /// <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 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 = "";    //鎶ュ伐缁撴潫鏃堕棿
+            if (operdate != "" && operdate != null)
+            {
+                operopendate = operdate.Split('~')[0].ToString();
+                operclosedate = operdate.Split('~')[1].ToString();
+            }
+            mes = ReportManagerBLL.GroupSalaryReportExcelSearch(wkshopcode,compute, wocode, saleordercode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+
+        #region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃]
+        /// <summary>
+        /// 浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃
+        /// </summary>
+        /// <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>
+        /// <param name="stepname">宸ュ簭鍚嶇О</param>
+        /// <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>
+        /// <param name="order">鎺掑簭瑙勫垯</param>
+        /// <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 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 = "";    //鎶ュ伐缁撴潫鏃堕棿
+            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(wkshopcode,compute, wocode, saleordercode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode, startNum, endNum, prop, order);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭]
+        /// <summary>
+        /// 浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭
+        /// </summary>
+        /// <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>
+        /// <param name="stepname">宸ュ簭鍚嶇О</param>
+        /// <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 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 = "";    //鎶ュ伐缁撴潫鏃堕棿
+            if (reportdate != "" && reportdate != null)
+            {
+                reportopendate = reportdate.Split('~')[0].ToString();
+                reportclosedate = reportdate.Split('~')[1].ToString();
+            }
+            mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(wkshopcode,compute, wocode, saleordercode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+
+        #region[涓嶈壇鏄庣粏鎶ヨ〃]
+        /// <summary>
+        /// 涓嶈壇鏄庣粏鎶ヨ〃 
+        /// </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>
+        /// <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 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 = "";    //鎶ュ伐缁撴潫鏃堕棿
+            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, saleordercode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[涓嶈壇鏄庣粏鎶ヨ〃瀵煎嚭]
+        /// <summary>
+        /// 涓嶈壇鏄庣粏鎶ヨ〃瀵煎嚭 
+        /// </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>
+        /// <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 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 = "";    //鎶ュ伐缁撴潫鏃堕棿
+            if (reportdate != "" && reportdate != null)
+            {
+                reportopendate = reportdate.Split('~')[0].ToString();
+                reportclosedate = reportdate.Split('~')[1].ToString();
+            }
+            mes = ReportManagerBLL.DefectDetailsReportExcelSearch(wkshopcode,wocode, saleordercode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+
+        #region[鍝佽川寮傚父鎺掕鎶ヨ〃(鍙栨姤宸ヤ笉鑹褰曠己闄峰垎缁勬眹鎬绘潯鏁�)]
+        /// <summary>
+        /// 鍝佽川寮傚父鎺掕鎶ヨ〃 
+        /// </summary>
+        /// <returns></returns>
+        [Route(template: "QuaneryDefectReportSearch")]
+        [HttpGet]
+        public HttpResponseMessage QuaneryDefectReportSearch()
+        {
+            mes = ReportManagerBLL.QuaneryDefectReportSearch();
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+
+        #region[缁翠慨鏄庣粏鎶ヨ〃]
+        /// <summary>
+        /// 缁翠慨鏄庣粏鎶ヨ〃 
+        /// </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>
+        /// <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 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 = "";    //缁翠慨缁撴潫鏃堕棿
+            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, saleordercode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[缁翠慨鏄庣粏鎶ヨ〃瀵煎嚭]
+        /// <summary>
+        /// 缁翠慨鏄庣粏鎶ヨ〃瀵煎嚭 
+        /// </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>
+        /// <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 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 = "";    //缁翠慨缁撴潫鏃堕棿
+            if (repairdate != "" && repairdate != null)
+            {
+                repairopendate = repairdate.Split('~')[0].ToString();
+                repairclosedate = repairdate.Split('~')[1].ToString();
+            }
+            mes = ReportManagerBLL.MaintenanceDetailsReportExcelSearch(wkshopcode,wocode, saleordercode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+
+        #region[瀹夌伅鎶ヨ〃鏄庣粏]
+        /// <summary>
+        /// 瀹夌伅鎶ヨ〃鏄庣粏
+        /// </summary>
+        /// <param name="page">椤电爜</param>
+        /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+        /// <param name="prop">鎺掑簭瀛楁</param>
+        /// <param name="order">鎺掑簭瑙勫垯</param>
+        /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+        /// <param name="calltypecode">鍛煎彨绫诲瀷缂栫爜</param>
+        /// <param name="calluser">鍛煎彨浜哄憳</param>
+        /// <param name="calldate">鍛煎彨鏃堕棿</param>
+        /// <param name="eqpcode">璁惧缂栫爜</param>
+        /// <param name="eqpname">璁惧鍚嶇О</param>
+        /// <param name="responduser">鍝嶅簲浜哄憳</param>
+        /// <param name="responddate">鍝嶅簲鏃堕棿</param>
+        /// <returns></returns>
+        [Route(template: "AnDonReportDefinitSearch")]
+        [HttpGet]
+        public HttpResponseMessage AnDonReportDefinitSearch(int page, int rows, string prop, string order, string wkshopcode = null, string calltypecode = null, string calluser = null, string calldate = null, string eqpcode = null, string eqpname = null, string responduser = null, string responddate = null)
+        {
+            string callopendate = "";        //鍛煎彨寮�濮嬫椂闂�
+            string callclosedate = "";       //鍛煎彨缁撴潫鏃堕棿
+            string respondopendate = "";     //鍝嶅簲寮�濮嬫椂闂�
+            string respondclosedate = "";    //鍝嶅簲缁撴潫鏃堕棿
+            if (calldate != "" && calldate != null)
+            {
+                callopendate = calldate.Split('~')[0].ToString();
+                callclosedate = calldate.Split('~')[1].ToString();
+            }
+            if (responddate != "" && responddate != null)
+            {
+                respondopendate = responddate.Split('~')[0].ToString();
+                respondclosedate = responddate.Split('~')[1].ToString();
+            }
+            int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
+            int endNum = rows * page;   //缁撴潫璁板綍 rowNum
+            mes = ReportManagerBLL.AnDonReportDefinitSearch(wkshopcode, calltypecode, calluser, callopendate, callclosedate, eqpcode, eqpname, responduser,respondopendate, respondclosedate, startNum, endNum, prop, order);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[瀹夌伅鎶ヨ〃鏄庣粏瀵煎嚭]
+        /// <summary>
+        /// 瀹夌伅鎶ヨ〃鏄庣粏瀵煎嚭
+        /// </summary>
+        /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+        /// <param name="calltypecode">鍛煎彨绫诲瀷缂栫爜</param>
+        /// <param name="calluser">鍛煎彨浜哄憳</param>
+        /// <param name="calldate">鍛煎彨鏃堕棿</param>
+        /// <param name="eqpcode">璁惧缂栫爜</param>
+        /// <param name="eqpname">璁惧鍚嶇О</param>
+        /// <param name="responduser">鍝嶅簲浜哄憳</param>
+        /// <param name="responddate">鍝嶅簲鏃堕棿</param>
+        /// <returns></returns>
+        [Route(template: "AnDonReportDefinitExcelSearch")]
+        [HttpGet]
+        public HttpResponseMessage AnDonReportDefinitExcelSearch(string wkshopcode = null, string calltypecode = null, string calluser = null, string calldate = null, string eqpcode = null, string eqpname = null, string responduser = null, string responddate = null)
+        {
+            string callopendate = "";        //鍛煎彨寮�濮嬫椂闂�
+            string callclosedate = "";       //鍛煎彨缁撴潫鏃堕棿
+            string respondopendate = "";     //鍝嶅簲寮�濮嬫椂闂�
+            string respondclosedate = "";    //鍝嶅簲缁撴潫鏃堕棿
+            if (calldate != "" && calldate != null)
+            {
+                callopendate = calldate.Split('~')[0].ToString();
+                callclosedate = calldate.Split('~')[1].ToString();
+            }
+            if (responddate != "" && responddate != null)
+            {
+                respondopendate = responddate.Split('~')[0].ToString();
+                respondclosedate = responddate.Split('~')[1].ToString();
+            }
+            mes = ReportManagerBLL.AnDonReportDefinitExcelSearch(wkshopcode, calltypecode, calluser, callopendate, callclosedate, eqpcode, eqpname, responduser, respondopendate, respondclosedate);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+
+        #region[瀹夌伅鎶ヨ〃姹囨�籡
+        /// <summary>
+        /// 瀹夌伅鎶ヨ〃姹囨��
+        /// </summary>
+        /// <param name="page">椤电爜</param>
+        /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+        /// <param name="prop">鎺掑簭瀛楁</param>
+        /// <param name="order">鎺掑簭瑙勫垯</param>
+        /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+        /// <param name="eqpcode">璁惧缂栫爜</param>
+        /// <param name="calltypecode">鍛煎彨绫诲瀷缂栫爜</param>     
+        /// <param name="calldate">鍛煎彨鏃堕棿</param>
+        /// <param name="responddate">鍝嶅簲鏃堕棿</param>
+        /// <returns></returns>
+        [Route(template: "AnDonReportSumSearch")]
+        [HttpGet]
+        public HttpResponseMessage AnDonReportSumSearch(int page, int rows, string prop, string order, string wkshopcode = null,string eqpcode=null, string calltypecode = null, string calldate = null, string responddate = null)
+        {
+            string callopendate = "";        //鍛煎彨寮�濮嬫椂闂�
+            string callclosedate = "";       //鍛煎彨缁撴潫鏃堕棿
+            string respondopendate = "";     //鍝嶅簲寮�濮嬫椂闂�
+            string respondclosedate = "";    //鍝嶅簲缁撴潫鏃堕棿
+            if (calldate != "" && calldate != null)
+            {
+                callopendate = calldate.Split('~')[0].ToString();
+                callclosedate = calldate.Split('~')[1].ToString();
+            }
+            if (responddate != "" && responddate != null)
+            {
+                respondopendate = responddate.Split('~')[0].ToString();
+                respondclosedate = responddate.Split('~')[1].ToString();
+            }
+            int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
+            int endNum = rows * page;   //缁撴潫璁板綍 rowNum
+            mes = ReportManagerBLL.AnDonReportSumSearch(wkshopcode, eqpcode, calltypecode, callopendate, callclosedate, respondopendate, respondclosedate, startNum, endNum, prop, order);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[瀹夌伅鎶ヨ〃姹囨�诲鍑篯
+        /// <summary>
+        /// 瀹夌伅鎶ヨ〃姹囨�诲鍑�
+        /// </summary>
+        /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+        /// <param name="eqpcode">璁惧缂栫爜</param>
+        /// <param name="calltypecode">鍛煎彨绫诲瀷缂栫爜</param>
+        /// <param name="calldate">鍛煎彨鏃堕棿</param>
+        /// <param name="responddate">鍝嶅簲鏃堕棿</param>
+        /// <returns></returns>
+        [Route(template: "AnDonReportSumExcelSearch")]
+        [HttpGet]
+        public HttpResponseMessage AnDonReportSumExcelSearch(string wkshopcode = null,string eqpcode=null, string calltypecode = null, string calldate = null, string responddate = null)
+        {
+            string callopendate = "";        //鍛煎彨寮�濮嬫椂闂�
+            string callclosedate = "";       //鍛煎彨缁撴潫鏃堕棿
+            string respondopendate = "";     //鍝嶅簲寮�濮嬫椂闂�
+            string respondclosedate = "";    //鍝嶅簲缁撴潫鏃堕棿
+            if (calldate != "" && calldate != null)
+            {
+                callopendate = calldate.Split('~')[0].ToString();
+                callclosedate = calldate.Split('~')[1].ToString();
+            }
+            if (responddate != "" && responddate != null)
+            {
+                respondopendate = responddate.Split('~')[0].ToString();
+                respondclosedate = responddate.Split('~')[1].ToString();
+            }
+            mes = ReportManagerBLL.AnDonReportSumExcelSearch(wkshopcode, eqpcode, calltypecode, callopendate, callclosedate, respondopendate, respondclosedate);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+
+
+        #region[鐗╂祦妫�楠岃褰曟煡璇
+        /// <summary>
+        /// 鐗╂祦妫�楠岃褰曟煡璇�
+        /// </summary>
+        /// <param name="page">椤电爜</param>
+        /// <param name="rows">姣忛〉鏄剧ず鏁版嵁鏉℃暟</param>
+        /// <param name="prop">鎺掑簭瀛楁</param>
+        /// <param name="order">鎺掑簭瑙勫垯</param>
+        /// <param name="checktypecode">妫�楠岀被鍨嬬紪鐮�</param>
+        /// <param name="partcode">鐗╂枡缂栫爜</param>
+        /// <param name="partname">鐗╂枡鍚嶇О</param>
+        /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+        /// <param name="labcode">鏉＄爜缂栧彿</param>
+        /// <param name="customercode">寰�鏉ュ崟浣嶇紪鐮�</param>
+        /// <param name="batchno">鎵规鏉＄爜</param>
+        /// <param name="checkuser">妫�楠屼汉鍛�</param>
+        /// <param name="checkdate">妫�楠屾椂闂�</param>
+        /// <returns></returns>
+        [Route(template: "LogisticsCheckSearch")]
+        [HttpGet]
+        public HttpResponseMessage LogisticsCheckSearch(int page, int rows, string prop, string order, string checktypecode = null, string partcode = null, string partname = null, string partspec = null, string labcode = null,string customercode=null,string batchno=null,string checkuser=null,string checkdate=null)
+        {
+            string opencheckdate = "";     //鍝嶅簲寮�濮嬫椂闂�
+            string closecheckdate = "";    //鍝嶅簲缁撴潫鏃堕棿
+            if (checkdate != "" && checkdate != null)
+            {
+                opencheckdate = checkdate.Split('~')[0].ToString();
+                closecheckdate = checkdate.Split('~')[1].ToString();
+            }
+            int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
+            int endNum = rows * page;   //缁撴潫璁板綍 rowNum
+            mes = ReportManagerBLL.LogisticsCheckSearch(checktypecode,partcode,partname,partspec,labcode,customercode,batchno,checkuser, opencheckdate, closecheckdate, startNum, endNum, prop, order);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[鐗╂祦妫�楠岋紝鏌ョ湅妫�楠屾槑缁哴
+        /// <summary>
+        /// 鐗╂祦妫�楠岋紝鏌ョ湅妫�楠屾槑缁�
+        /// </summary>
+        /// <param name="checkid">妫�楠岃褰旾D</param>
+        /// <returns></returns>
+        [Route(template: "LogisticsCheckSubSearch")]
+        [HttpGet]
+        public HttpResponseMessage LogisticsCheckSubSearch(string checkid)
+        {
+            mes = ReportManagerBLL.LogisticsCheckSubSearch(checkid);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+
+        #region[鐢熶骇杩涘害鎶ヨ〃]
+        /// <summary>
+        /// 鐢熶骇杩涘害鎶ヨ〃
+        /// </summary>
+        /// <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>
+        /// <param name="partname">浜у搧鍚嶇О</param>
+        /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+        /// <param name="lm_date">鍗曟嵁鏃ユ湡</param>
+        /// <param name="page">椤电爜</param>
+        /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+        /// <param name="prop">鎺掑簭瀛楁</param>
+        /// <param name="order">鎺掑簭瑙勫垯</param>
+        /// <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 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 = "";    //缁撴潫鏃堕棿
+            if (lm_date != "" && lm_date != null)
+            {
+                opendate = lm_date.Split('~')[0].ToString();
+                closedate = lm_date.Split('~')[1].ToString();
+            }
+            int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
+            int endNum = rows * page;   //缁撴潫璁板綍 rowNum
+            mes = ReportManagerBLL.ProductionScheduleReportSearch(wkshopcode,status, wocode, saleordercode, routecode, routename, partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
+            return TJson.toJson(mes);
+        }
+        #endregion
+
+        #region[鐢熶骇杩涘害鎶ヨ〃瀵煎嚭]
+        /// <summary>
+        /// 鐢熶骇杩涘害鎶ヨ〃瀵煎嚭
+        /// </summary>
+        /// <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>
+        /// <param name="partname">浜у搧鍚嶇О</param>
+        /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+        /// <param name="lm_date">鍗曟嵁鏃ユ湡</param>
+        /// <returns></returns>
+        [Route(template: "ProductionScheduleReportExcelSearch")]
+        [HttpGet]
+        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 = "";    //缁撴潫鏃堕棿
+            if (lm_date != "" && lm_date != null)
+            {
+                opendate = lm_date.Split('~')[0].ToString();
+                closedate = lm_date.Split('~')[1].ToString();
+            }
+            mes = ReportManagerBLL.ProductionScheduleReportExcelSearch(wkshopcode,status, wocode, saleordercode, routecode, routename, partcode, partname, partspec, opendate, closedate);
+            return TJson.toJson(mes);
+        }
+        #endregion
     }
 }

--
Gitblit v1.9.3