Merge branch 'master' of http://dev.ccwin-in.com:3000/zhibinlv/QRAPI

API/Wood.Service/Controllers/CherySupplierProEnvironmentService.cs

@@ -0,0 +1,19 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Entity;
+using TaskManager.Entity.Entitys;
+using TaskManager.EntityFramework;
+
+namespace TaskManager.Controllers
+{
+    /// <summary>
+    /// 环境业务数据
+    /// </summary>
+    public class CherySupplierProEnvironmentService : CheryRecurringJobInputPageController<SUPPLIER_PRO_ENVIRONMENT, SUPPLIER_PRO_ENVIRONMENT_DTO>
+    {
+        public CherySupplierProEnvironmentService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_ENVIRONMENT> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+
+        }
+    }
+    
+}

API/Wood.Service/Controllers/CherySupplierProMaterialStockService.cs

@@ -0,0 +1,17 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Entity;
+using TaskManager.EntityFramework;
+
+namespace TaskManager.Controllers
+{
+    /// <summary>
+    /// 来料检验数据
+    /// </summary>
+    public class SupplierProMaterialStockService : CheryRecurringJobInputPageController<SUPPLIER_PRO_MATERIAL_STOCK, SUPPLIER_PRO_MATERIAL_STOCK_DTO>
+    {
+        public SupplierProMaterialStockService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_MATERIAL_STOCK> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+
+        }
+    }
+}

API/Wood.Service/Controllers/CherySupplierProOeeAchievementRateService.cs

@@ -0,0 +1,18 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Entity;
+using TaskManager.Entity.Entitys;
+using TaskManager.EntityFramework;
+
+namespace TaskManager.Controllers
+{
+    /// <summary>
+    /// 设备OEE达成率
+    /// </summary>
+    public class CherySupplierProOeeAchievementRateService : CheryRecurringJobInputPageController<SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE, SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_DTO>
+    {
+        public CherySupplierProOeeAchievementRateService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+
+        }
+    }
+}

API/Wood.Service/Controllers/CherySupplierProOeeTimeDetailsService.cs

@@ -0,0 +1,18 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Entity;
+using TaskManager.Entity.Entitys;
+using TaskManager.EntityFramework;
+
+namespace TaskManager.Controllers
+{
+    /// <summary>
+    /// OEE时间明细
+    /// </summary>
+    public class CherySupplierProOeeTimeDetailsService : CheryRecurringJobInputPageController<SUPPLIER_PRO_OEE_TIME_DETAILS, SUPPLIER_PRO_OEE_TIME_DETAILS_DTO>
+    {
+        public CherySupplierProOeeTimeDetailsService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_OEE_TIME_DETAILS> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+
+        }
+    }
+}

API/Wood.Service/Controllers/SUPPLIER_PRO_ENVIRONMENT_Service.cs

@@ -1,5 +0,0 @@
-namespace TaskManager.Controllers
-{
-    public class SUPPLIER_PRO_ENVIRONMENT_Service { }
-    
-}

API/Wood.Service/Controllers/SUPPLIER_PRO_MATERIAL_STOCK_Service.cs

@@ -1,6 +0,0 @@
-namespace TaskManager.Controllers
-{
-    public class SUPPLIER_PRO_MATERIAL_STOCK_Service
-    {
-    }
-}

API/Wood.Service/Controllers/SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_Service.cs

@@ -1,6 +0,0 @@
-namespace TaskManager.Controllers
-{
-    public class SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_Service
-    {
-    }
-}

API/Wood.Service/Controllers/SUPPLIER_PRO_OEE_TIME_DETAILS_Service.cs

@@ -1,6 +0,0 @@
-namespace TaskManager.Controllers
-{
-    public class SUPPLIER_PRO_OEE_TIME_DETAILS_Service
-    {
-    }
-}

API/Wood.Service/Controllers/TaskConifgureController.cs

@@ -271,14 +271,14 @@ namespace TaskManager.Controllers
 
                 switch (task.TaskName)
                 {
-                    //case "来料检验数据":
+                    case "来料检验数据":
-                    //    RecurringJob.AddOrUpdate<SUPPLIER_PRO_MATERIAL_STOCK_CONTROLLER>(
+                        RecurringJob.AddOrUpdate<SupplierProMaterialStockService>(
-                    //        task.TaskName,
+                            task.TaskName,
-                    //        x => ((IDoExecute)x).ExecuteAsync(url,path,task.TaskName),
+                            x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName, client),
-                    //        task.Corn,
+                            task.Corn,
-                    //        TimeZoneInfo.Local
+                            TimeZoneInfo.Local
-                    //    );
+                        );
-                    //    break;
+                        break;
                     case "排产数据":
                         RecurringJob.AddOrUpdate<CherySupplierProSchedulingService>(
                             task.TaskName,
@@ -351,30 +351,30 @@ namespace TaskManager.Controllers
                             TimeZoneInfo.Local
                         );
                         break;
-                    //case "环境业务数据":
+                    case "环境业务数据":
-                    //    RecurringJob.AddOrUpdate<SUPPLIER_PRO_ENVIRONMENT_CONTROLLER>(
+                        RecurringJob.AddOrUpdate<CherySupplierProEnvironmentService>(
-                    //        task.TaskName,
+                            task.TaskName,
-                    //        x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                            x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName, client),
-                    //        task.Corn,
+                            task.Corn,
-                    //        TimeZoneInfo.Local
+                            TimeZoneInfo.Local
-                    //    );
+                        );
-                    //    break;
+                        break;
-                    //case "设备OEE达成率":
+                    case "设备OEE达成率":
-                    //    RecurringJob.AddOrUpdate<SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_CONTROLLER>(
+                        RecurringJob.AddOrUpdate<CherySupplierProOeeAchievementRateService>(
-                    //        task.TaskName,
+                            task.TaskName,
-                    //        x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                            x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName, client),
-                    //        task.Corn,
+                            task.Corn,
-                    //        TimeZoneInfo.Local
+                            TimeZoneInfo.Local
-                    //    );
+                        );
-                    //    break;
+                        break;
-                    //case "OEE时间明细":
+                    case "OEE时间明细":
-                    //    RecurringJob.AddOrUpdate<SUPPLIER_PRO_OEE_TIME_DETAILS_CONTROLLER>(
+                        RecurringJob.AddOrUpdate<CherySupplierProOeeTimeDetailsService>(
-                    //        task.TaskName,
+                            task.TaskName,
-                    //        x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                            x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName, client),
-                    //        task.Corn,
+                            task.Corn,
-                    //        TimeZoneInfo.Local
+                            TimeZoneInfo.Local
-                    //    );
+                        );
-                    //    break;
+                        break;
                     //case "物料主数据":
                     //    RecurringJob.AddOrUpdate<SUPPLIER_PRO_MATERIAL_DATA_CONTROLLER>(
                     //        task.TaskName,