From babba50e6ffe9400c41f9a937b8e5f89384b39ee Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 20 三月 2024 15:29:36 +0800
Subject: [PATCH] 生产进度报表查询参数修改

---
 VueWebCoreApi/DLL/BLL/ReportManagerBLL.cs |    4 ++--
 VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs |   34 ++--------------------------------
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/VueWebCoreApi/DLL/BLL/ReportManagerBLL.cs b/VueWebCoreApi/DLL/BLL/ReportManagerBLL.cs
index 3abaf3b..1fba1ea 100644
--- a/VueWebCoreApi/DLL/BLL/ReportManagerBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/ReportManagerBLL.cs
@@ -12,14 +12,14 @@
         #region[鐢熶骇杩涘害鎶ヨ〃]
         public static ToMessage ProductionScheduleReportSearch(string status, string wkshopcode,string wocode,string partcode, string partname, string partspec, string opendate, string closedate, int startNum, int endNum, string prop, string order)
         {
-            return ReportManagerDAL.ProductionScheduleReportSearch(status, wkshopcode, wocode,partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
+            return ReportManagerDAL.ProductionScheduleReportSearch(wkshopcode,status, wocode,partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
         }
         #endregion
 
         #region[鐢熶骇杩涘害鎶ヨ〃瀵煎嚭]
         public static ToMessage ProductionScheduleReportExcelSearch(string status, string wkshopcode, string wocode, string partcode, string partname, string partspec, string opendate, string closedate)
         {
-            return ReportManagerDAL.ProductionScheduleReportExcelSearch(status, wkshopcode, wocode, partcode, partname, partspec, opendate, closedate);
+            return ReportManagerDAL.ProductionScheduleReportExcelSearch(wkshopcode,status, wocode, partcode, partname, partspec, opendate, closedate);
         }
         #endregion
 
diff --git a/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs b/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
index a938209..1b8d0aa 100644
--- a/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
@@ -20,7 +20,7 @@
 
 
         #region[鐢熶骇杩涘害鎶ヨ〃]
-        public static ToMessage ProductionScheduleReportSearch(string wkshopcode, string status, string wocode, string saleordercode, string routecode, string routename, string partcode, string partname, string partspec, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+        public static ToMessage ProductionScheduleReportSearch(string wkshopcode, string status, string wocode, string partcode, string partname, string partspec, string opendate, string closedate, int startNum, int endNum, string prop, string order)
         {
             var dynamicParams = new DynamicParameters();
             string search = "";
@@ -50,21 +50,6 @@
                 {
                     search += "and AA.wo_code like '%'+@wocode+'%' ";
                     dynamicParams.Add("@wocode", wocode);
-                }
-                if (saleordercode != "" && saleordercode != null)
-                {
-                    search += "and AA.saleOrderCode like '%'+@saleordercode+'%' ";
-                    dynamicParams.Add("@saleordercode", saleordercode);
-                }
-                if (routecode != "" && routecode != null)
-                {
-                    search += "and AA.route_code like '%'+@routecode+'%' ";
-                    dynamicParams.Add("@routecode", routecode);
-                }
-                if (routename != "" && routename != null)
-                {
-                    search += "and AA.route_name like '%'+@routename+'%' ";
-                    dynamicParams.Add("@routename", routename);
                 }
                 if (partcode != "" && partcode != null)
                 {
@@ -134,7 +119,7 @@
         #endregion
 
         #region[鐢熶骇杩涘害鎶ヨ〃瀵煎嚭]
-        public static ToMessage ProductionScheduleReportExcelSearch(string wkshopcode, string status, string wocode, string saleordercode, string routecode, string routename, string partcode, string partname, string partspec, string opendate, string closedate)
+        public static ToMessage ProductionScheduleReportExcelSearch(string wkshopcode, string status, string wocode, string partcode, string partname, string partspec, string opendate, string closedate)
         {
             var dynamicParams = new DynamicParameters();
             string search = "";
@@ -164,21 +149,6 @@
                 {
                     search += "and AA.wo_code like '%'+@wocode+'%' ";
                     dynamicParams.Add("@wocode", wocode);
-                }
-                if (saleordercode != "" && saleordercode != null)
-                {
-                    search += "and AA.saleOrderCode like '%'+@saleordercode+'%' ";
-                    dynamicParams.Add("@saleordercode", saleordercode);
-                }
-                if (routecode != "" && routecode != null)
-                {
-                    search += "and AA.route_code like '%'+@routecode+'%' ";
-                    dynamicParams.Add("@routecode", routecode);
-                }
-                if (routename != "" && routename != null)
-                {
-                    search += "and AA.route_name like '%'+@routename+'%' ";
-                    dynamicParams.Add("@routename", routename);
                 }
                 if (partcode != "" && partcode != null)
                 {

--
Gitblit v1.9.3