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

API/Wood.Service/Controllers/CherySupplierProMaterialDataService.cs

@@ -0,0 +1,15 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Entity;
+using TaskManager.Entity.Entitys;
+using TaskManager.EntityFramework;
+
+namespace TaskManager.Controllers
+{
+    public class CherySupplierProMaterialDataService : CheryRecurringJobInputPageController<SUPPLIER_PRO_MATERIAL_DATA, SUPPLIER_PRO_MATERIAL_DATA_DTO>
+    {
+        public CherySupplierProMaterialDataService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_MATERIAL_DATA> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+
+        }
+    }
+}

API/Wood.Service/Controllers/SUPPLIER_PRO_MATERIAL_DATA_Service.cs

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

API/Wood.Service/Controllers/TaskConifgureController.cs

@@ -375,14 +375,14 @@ namespace TaskManager.Controllers
                             TimeZoneInfo.Local
                         );
                         break;
-                    //case "物料主数据":
+                    case "物料主数据":
-                    //    RecurringJob.AddOrUpdate<SUPPLIER_PRO_MATERIAL_DATA_CONTROLLER>(
+                        RecurringJob.AddOrUpdate<CherySupplierProMaterialDataService>(
-                    //        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_PROCESS_EQUIPMENT_CONTROLLER>(
                     //        task.TaskName,