From 54cf93766639d96ed2bdd101440d2ce9f2538e7e Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 12 九月 2023 18:54:44 +0800
Subject: [PATCH] 正清和质量看板接口功能 修改存货查询功能

---
 VueWebApi/Controllers/ReportManagerController.cs |  180 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 159 insertions(+), 21 deletions(-)

diff --git a/VueWebApi/Controllers/ReportManagerController.cs b/VueWebApi/Controllers/ReportManagerController.cs
index 213bc99..1090f4b 100644
--- a/VueWebApi/Controllers/ReportManagerController.cs
+++ b/VueWebApi/Controllers/ReportManagerController.cs
@@ -11,7 +11,7 @@
 {
     [RoutePrefix(prefix: "api/ReportManager")]
     [ControllerGroup("鎶ヨ〃绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
-    //[ChannelActionFilter]
+    [ChannelActionFilter]
     public class ReportManagerController : ApiController
     {
         //瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -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,8 @@
         /// <summary>
         /// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
         /// </summary>
+        /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
+        /// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
         /// <param name="wocode">宸ュ崟缂栧彿</param>
         /// <param name="partcode">浜у搧缂栫爜</param>
         /// <param name="partname">浜у搧鍚嶇О</param>
@@ -97,6 +101,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,7 +109,7 @@
         /// <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 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 = "";    //鎶ュ伐缁撴潫鏃堕棿
@@ -115,7 +120,7 @@
             }
             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, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode, startNum, endNum, prop, order);
             return TJson.toJson(mes);
         }
         #endregion
@@ -139,6 +144,8 @@
         /// <summary>
         /// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
         /// </summary>
+        /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
+        /// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
         /// <param name="wocode">宸ュ崟缂栧彿</param>
         /// <param name="partcode">浜у搧缂栫爜</param>
         /// <param name="partname">浜у搧鍚嶇О</param>
@@ -147,10 +154,11 @@
         /// <param name="groupcode">鐢熶骇鐝粍</param>
         /// <param name="username">鎿嶄綔浜哄憳</param>
         /// <param name="operdate">鎿嶄綔鏃堕棿</param>
+        /// <param name="rejectstepcode">鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�)</param>
         /// <returns></returns>
         [Route(template: "GroupSalaryReportExcelSearch")]
         [HttpGet]
-        public HttpResponseMessage GroupSalaryReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)
+        public HttpResponseMessage GroupSalaryReportExcelSearch(string compute, string 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 = "";    //鎶ュ伐缁撴潫鏃堕棿
@@ -159,7 +167,7 @@
                 operopendate = operdate.Split('~')[0].ToString();
                 operclosedate = operdate.Split('~')[1].ToString();
             }
-            mes = ReportManagerBLL.GroupSalaryReportExcelSearch(wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate);
+            mes = ReportManagerBLL.GroupSalaryReportExcelSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);
             return TJson.toJson(mes);
         }
         #endregion
@@ -169,6 +177,8 @@
         /// <summary>
         /// 浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃
         /// </summary>
+        /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
+        /// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
         /// <param name="wocode">宸ュ崟缂栧彿</param>
         /// <param name="partcode">浜у搧缂栫爜</param>
         /// <param name="partname">浜у搧鍚嶇О</param>
@@ -177,6 +187,7 @@
         /// <param name="groupcode">鐢熶骇鐝粍</param>
         /// <param name="reportname">鎶ュ伐浜哄憳</param>
         /// <param name="reportdate">鎶ュ伐鏃堕棿</param>
+        /// <param name = "rejectstepcode" > 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�) </param >
         /// <param name="page">椤电爜</param>
         /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
         /// <param name="prop">鎺掑簭瀛楁</param>
@@ -184,7 +195,7 @@
         /// <returns></returns>
         [Route(template: "PeopleSalaryReportSearch")]
         [HttpGet]
-        public HttpResponseMessage PeopleSalaryReportSearch(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 reportname = null, string reportdate = 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 = "";    //鎶ュ伐缁撴潫鏃堕棿
@@ -195,7 +206,7 @@
             }
             int startNum = rows * (page - 1) + 1;  //璧峰璁板綍rowNum
             int endNum = rows * page;   //缁撴潫璁板綍 rowNum
-            mes = ReportManagerBLL.PeopleSalaryReportSearch(wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, 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
@@ -204,6 +215,8 @@
         /// <summary>
         /// 浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭
         /// </summary>
+        /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
+        /// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
         /// <param name="wocode">宸ュ崟缂栧彿</param>
         /// <param name="partcode">浜у搧缂栫爜</param>
         /// <param name="partname">浜у搧鍚嶇О</param>
@@ -212,10 +225,11 @@
         /// <param name="groupcode">鐢熶骇鐝粍</param>
         /// <param name="reportname">鎶ュ伐浜哄憳</param>
         /// <param name="reportdate">鎶ュ伐鏃堕棿</param>
+        /// <param name = "rejectstepcode" > 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�) </param >
         /// <returns></returns>
         [Route(template: "PeopleSalaryReportExcelSearch")]
         [HttpGet]
-        public HttpResponseMessage PeopleSalaryReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string reportname = null, string reportdate = null)
+        public HttpResponseMessage PeopleSalaryReportExcelSearch(string compute, string 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 = "";    //鎶ュ伐缁撴潫鏃堕棿
@@ -224,7 +238,7 @@
                 reportopendate = reportdate.Split('~')[0].ToString();
                 reportclosedate = reportdate.Split('~')[1].ToString();
             }
-            mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate);
+            mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode);
             return TJson.toJson(mes);
         }
         #endregion
@@ -234,6 +248,7 @@
         /// <summary>
         /// 涓嶈壇鏄庣粏鎶ヨ〃 
         /// </summary>
+        /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
         /// <param name="wocode">宸ュ崟缂栧彿</param>
         /// <param name="partcode">浜у搧缂栫爜</param>
         /// <param name="partname">浜у搧鍚嶇О</param>
@@ -250,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 = "";    //鎶ュ伐缁撴潫鏃堕棿
@@ -261,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
@@ -270,6 +285,7 @@
         /// <summary>
         /// 涓嶈壇鏄庣粏鎶ヨ〃瀵煎嚭 
         /// </summary>
+        /// <param name=" wkshopcode">杞﹂棿缂栫爜</param>
         /// <param name="wocode">宸ュ崟缂栧彿</param>
         /// <param name="partcode">浜у搧缂栫爜</param>
         /// <param name="partname">浜у搧鍚嶇О</param>
@@ -282,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 = "";    //鎶ュ伐缁撴潫鏃堕棿
@@ -291,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
@@ -316,6 +332,7 @@
         /// <summary>
         /// 缁翠慨鏄庣粏鎶ヨ〃 
         /// </summary>
+        /// <param name="wkshopcode">杞﹂棿缂栧彿</param>
         /// <param name="wocode">宸ュ崟缂栧彿</param>
         /// <param name="partcode">浜у搧缂栫爜</param>
         /// <param name="partname">浜у搧鍚嶇О</param>
@@ -332,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 = "";    //缁翠慨缁撴潫鏃堕棿
@@ -343,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
@@ -352,6 +369,7 @@
         /// <summary>
         /// 缁翠慨鏄庣粏鎶ヨ〃瀵煎嚭 
         /// </summary>
+        /// <param name="wkshopcode">杞﹂棿缂栧彿</param>
         /// <param name="wocode">宸ュ崟缂栧彿</param>
         /// <param name="partcode">浜у搧缂栫爜</param>
         /// <param name="partname">浜у搧鍚嶇О</param>
@@ -364,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 = "";    //缁翠慨缁撴潫鏃堕棿
@@ -373,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
@@ -529,5 +547,125 @@
             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="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 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, 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="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 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, routecode, routename, partcode, partname, partspec, opendate, closedate);
+            return TJson.toJson(mes);
+        }
+        #endregion
     }
 }

--
Gitblit v1.9.3