From 32c0daf9a78039004bb6c39d578f7734f13d54b1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 10 十月 2023 10:54:47 +0800
Subject: [PATCH] 1.工单派发校验工价，工价未提前设置或设置部分，如果开关关闭时,不校验是否未设置 或者未设置全，工价复制表中都会写入，没有设置的工价就默认0 如果开关打开就必须要设置工价

---
 VueWebApi/DLL/BLL/ReportManagerBLL.cs |   70 +++++++++++++++++++++++++----------
 1 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/VueWebApi/DLL/BLL/ReportManagerBLL.cs b/VueWebApi/DLL/BLL/ReportManagerBLL.cs
index 72f8bbc..cbdcfca 100644
--- a/VueWebApi/DLL/BLL/ReportManagerBLL.cs
+++ b/VueWebApi/DLL/BLL/ReportManagerBLL.cs
@@ -10,24 +10,24 @@
     public class ReportManagerBLL
     {
         #region[濮斿鎶ヨ〃璁板綍鏌ヨ]
-        public static ToMessage OutSourceReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate, int startNum, int endNum, string prop, string order)
+        public static ToMessage OutSourceReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate, int startNum, int endNum, string prop, string order)
         {
-            return ReportManagerDAL.OutSourceReportSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
+            return ReportManagerDAL.OutSourceReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
         }
         #endregion
 
         #region[濮斿鎶ヨ〃璁板綍瀵煎嚭]
-        public static ToMessage OutSourceReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate)
+        public static ToMessage OutSourceReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate)
         {
-            return ReportManagerDAL.OutSourceReportExcelSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
+            return ReportManagerDAL.OutSourceReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
         }
         #endregion
 
 
         #region[鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ]
-        public static ToMessage GroupSalaryReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate, int startNum, int endNum, string prop, string order)
+        public static ToMessage GroupSalaryReportSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode, int startNum, int endNum, string prop, string order)
         {
-            return ReportManagerDAL.GroupSalaryReportSearch(wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, startNum, endNum, prop, order);
+            return ReportManagerDAL.GroupSalaryReportSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode, startNum, endNum, prop, order);
         }
         #endregion
 
@@ -39,39 +39,39 @@
         #endregion
 
         #region[鐝粍宸ヨ祫鎶ヨ〃璁板綍瀵煎嚭]
-        public static ToMessage GroupSalaryReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate)
+        public static ToMessage GroupSalaryReportExcelSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate,string rejectstepcode)
         {
-            return ReportManagerDAL.GroupSalaryReportExcelSearch(wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate);
+            return ReportManagerDAL.GroupSalaryReportExcelSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, rejectstepcode);
         }
         #endregion
 
 
         #region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃]
-        public static ToMessage PeopleSalaryReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
+        public static ToMessage PeopleSalaryReportSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode, int startNum, int endNum, string prop, string order)
         {
-            return ReportManagerDAL.PeopleSalaryReportSearch(wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
+            return ReportManagerDAL.PeopleSalaryReportSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode, startNum, endNum, prop, order);
         }
         #endregion
 
         #region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭]
-        public static ToMessage PeopleSalaryReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate)
+        public static ToMessage PeopleSalaryReportExcelSearch(string wkshopcode, string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string reportname, string reportopendate, string reportclosedate,string rejectstepcode)
         {
-            return ReportManagerDAL.PeopleSalaryReportExcelSearch(wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate);
+            return ReportManagerDAL.PeopleSalaryReportExcelSearch(wkshopcode,compute, wocode, partcode, partname, partspec, stepname, groupcode, reportname, reportopendate, reportclosedate, rejectstepcode);
         }
         #endregion
 
 
         #region[涓嶈壇鏄庣粏鎶ヨ〃]
-        public static ToMessage DefectDetailsReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
+        public static ToMessage DefectDetailsReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
         {
-            return ReportManagerDAL.DefectDetailsReportSearch(wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
+            return ReportManagerDAL.DefectDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
         }
         #endregion
 
         #region[涓嶈壇鏄庣粏鎶ヨ〃瀵煎嚭]
-        public static ToMessage DefectDetailsReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate)
+        public static ToMessage DefectDetailsReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate)
         {
-            return ReportManagerDAL.DefectDetailsReportExcelSearch(wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
+            return ReportManagerDAL.DefectDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
         }
         #endregion
 
@@ -85,16 +85,16 @@
 
 
         #region[缁翠慨鏄庣粏鎶ヨ〃]
-        public static ToMessage MaintenanceDetailsReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate, int startNum, int endNum, string prop, string order)
+        public static ToMessage MaintenanceDetailsReportSearch(string wkshopcode,string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate, int startNum, int endNum, string prop, string order)
         {
-            return ReportManagerDAL.MaintenanceDetailsReportSearch(wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
+            return ReportManagerDAL.MaintenanceDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
         }
         #endregion
 
         #region[缁翠慨鏄庣粏鎶ヨ〃瀵煎嚭]
-        public static ToMessage MaintenanceDetailsReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate)
+        public static ToMessage MaintenanceDetailsReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate)
         {
-            return ReportManagerDAL.MaintenanceDetailsReportExcelSearch(wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
+            return ReportManagerDAL.MaintenanceDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
         }
         #endregion
 
@@ -127,5 +127,35 @@
             return ReportManagerDAL.AnDonReportSumExcelSearch(wkshopcode, eqpcode, calltypecode, callopendate, callclosedate, respondopendate, respondclosedate);
         }
         #endregion
+
+
+        #region[鐗╂祦妫�楠岃褰曟煡璇
+        public static ToMessage LogisticsCheckSearch(string checktypecode, string partcode, string partname, string partspec, string labcode, string customercode, string batchno, string checkuser, string opencheckdate, string closecheckdate, int startNum, int endNum, string prop, string order)
+        {
+            return ReportManagerDAL.LogisticsCheckSearch(checktypecode, partcode, partname, partspec, labcode, customercode, batchno, checkuser, opencheckdate, closecheckdate, startNum, endNum, prop, order);
+        }
+        #endregion
+
+        #region[鐗╂祦妫�楠岋紝鏌ョ湅妫�楠屾槑缁哴
+        public static ToMessage LogisticsCheckSubSearch(string checkid)
+        {
+            return ReportManagerDAL.LogisticsCheckSubSearch(checkid);
+        }
+        #endregion
+
+
+        #region[鐢熶骇杩涘害鎶ヨ〃]
+        public static ToMessage ProductionScheduleReportSearch(string wkshopcode, string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate, int startNum, int endNum, string prop, string order)
+        {
+            return ReportManagerDAL.ProductionScheduleReportSearch(wkshopcode,status, wocode, routecode, routename, partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
+        }
+        #endregion
+
+        #region[鐢熶骇杩涘害鎶ヨ〃瀵煎嚭]
+        public static ToMessage ProductionScheduleReportExcelSearch(string wkshopcode, string status, string wocode, string routecode, string routename, string partcode, string partname, string partspec,string opendate,string closedate)
+        {
+            return ReportManagerDAL.ProductionScheduleReportExcelSearch(wkshopcode,status, wocode, routecode, routename, partcode, partname, partspec,opendate, closedate);
+        }
+        #endregion
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3