更新版本

API/Wood.Admin.WebApi/Startup.cs

@@ -97,50 +97,50 @@ namespace Wood.Admin.WebApi
 			services.AddSqlSugar(Configuration);
 
             services.AddHttpClient();
-            services.AddScoped<LogController>();
+            //services.AddScoped<LogController>();
  
-            services.AddScoped<TaskConifgureController>();
+            //services.AddScoped<TaskConifgureController>();
 
-            // 注册所有需要通过 GetRequiredService 获取的服务
+            //// 注册所有需要通过 GetRequiredService 获取的服务
 
-            // 1. 整车月度生产计划相关
+            //// 1. 整车月度生产计划相关
-            services.AddScoped<SupplierProPlaningService>();
+            //services.AddScoped<SupplierProPlaningService>();
 
-            // 2. M+6月物料需求计划相关
+            //// 2. M+6月物料需求计划相关
-            services.AddScoped<CherySupplierMrpMonthService>();
+            //services.AddScoped<CherySupplierMrpMonthService>();
 
-            // 3. 日物料需求计划相关
+            //// 3. 日物料需求计划相关
-            services.AddScoped<CherySupplierMrpDataService>();
+            //services.AddScoped<CherySupplierMrpDataService>();
 
-            // 4. 计划协议相关
+            //// 4. 计划协议相关
-            services.AddScoped<CherySupplierSaWeekService>();
+            //services.AddScoped<CherySupplierSaWeekService>();
 
-            // 5. 采购订单相关
+            //// 5. 采购订单相关
-            services.AddScoped<CherySupplierPoService>();
+            //services.AddScoped<CherySupplierPoService>();
 
-            // 6. 过焊装未过总装相关
+            //// 6. 过焊装未过总装相关
-            services.AddScoped<CherySupplierPorHSCHEDULService>();
+            //services.AddScoped<CherySupplierPorHSCHEDULService>();
 
-            // 7. 过涂装未过总装相关
+            //// 7. 过涂装未过总装相关
-            services.AddScoped<CherySupplierProTSCHEDULService>(); // 注意类型名是否包含大小写问题（如驼峰命名）
+            //services.AddScoped<CherySupplierProTSCHEDULService>(); // 注意类型名是否包含大小写问题（如驼峰命名）
 
-            // 8. 排序供货相关
+            //// 8. 排序供货相关
-            services.AddScoped<CherySupplierProCSCHEDULService>();
+            //services.AddScoped<CherySupplierProCSCHEDULService>();
 
-            // 9. 看板配送单相关
+            //// 9. 看板配送单相关
-            services.AddScoped<CherySupplierDelStateService>();
+            //services.AddScoped<CherySupplierDelStateService>();
 
-            // 10. 退货单相关
+            //// 10. 退货单相关
-            services.AddScoped<CherySupplierReturnService>();
+            //services.AddScoped<CherySupplierReturnService>();
 
-            // 11. 奇瑞RDC共享库存相关
+            //// 11. 奇瑞RDC共享库存相关
-            services.AddScoped<SupplierInvDataService>();
+            //services.AddScoped<SupplierInvDataService>();
 
-            // 12. 日MRP预警推移相关
+            //// 12. 日MRP预警推移相关
-            services.AddScoped<CherySupplierMrpWarningService>();
+            //services.AddScoped<CherySupplierMrpWarningService>();
 
-            // 13. 供应商共享库存相关
+            //// 13. 供应商共享库存相关
-            services.AddScoped<CherySupplierSinvDataService>();
+            //services.AddScoped<CherySupplierSinvDataService>();
 
 
             // 14. 风险确认相关服务（如果类型名正确）
@@ -279,10 +279,10 @@ namespace Wood.Admin.WebApi
 			services.AddAuthorization();
 
 			// 添加 Quartz 服务
-			services.AddQuartz(q =>
+			//services.AddQuartz(q =>
-			{
+			//{
-				q.UseSimpleTypeLoader();
+			//	q.UseSimpleTypeLoader();
-			});
+			//});
 
 			//获取所有Service业务层进行扫描注入
 			//业务层命名格式：Wood.xxx.Service
@@ -422,7 +422,7 @@ namespace Wood.Admin.WebApi
 			});
 
 			//启用 自动job
-			app.UseAutoJob();
+			//app.UseAutoJob();
 
 			//获取所有Service业务层 扫描事件
 			//业务层命名格式：Wood.xxx.Service

API/Wood.Service/Controllers/CheryRecurringJobBaseController.cs

@@ -16,6 +16,7 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using TaskManager.Entity;
 using TaskManager.EntityFramework;
+using Wood.Entity;
 
 
 
@@ -23,7 +24,7 @@ using TaskManager.EntityFramework;
 namespace TaskManager.Controllers
 {
     [AllowAnonymous]
-    public class CheryRecurringJobBaseController :ControllerBase,  IDoExecute
+    public class CheryRecurringJobBaseController :ControllerBase,  IDoExecute,IScoped
     {
         protected string appKey = "8EG566b9bedd2bf46d";
         protected string appSecret = "48edc4425647425d87f806a1ba492580";
@@ -35,8 +36,6 @@ namespace TaskManager.Controllers
         protected virtual string TaskName { set; get; } = "SupplierProPlaning";
 
         protected readonly LogController _logger;
-       
-
 
 
         public CheryRecurringJobBaseController(
@@ -58,8 +57,6 @@ namespace TaskManager.Controllers
         /// <returns>返回DTOJson</returns>
         protected async Task<string> Post(string url, string path, string jsonData)
         {
-          
-
             try
             {
                 // 生成签名参数

API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs

@@ -31,9 +31,11 @@ namespace TaskManager.Controllers
         {
             _repository = repository;
         }
+        protected virtual async Task CreateTaskAsync(List<T> plist,JobDbContext dbContext)
+        { 
 
 
-
+        }
         [NonAction]
         public async Task<List<ToutputDetial>> FetchAllDataAsync(string inputdate)
         {
@@ -48,8 +50,6 @@ namespace TaskManager.Controllers
             {
                 PagedResponse<ToutputDetial> firstResponse = await GetPageAsync(new PAGE_DTO() { Date = date, IsForce = false});
 
-
-
                 if (firstResponse == null || firstResponse.Code != 200)
                 {
                     await _logger.AddError("首次请求失败，无法获取分页信息。", TaskName);
@@ -59,7 +59,6 @@ namespace TaskManager.Controllers
                 {
                     await _logger.AddError("首次请求失败，Total为0是否已经全部读取过。", TaskName);
                     return allData;
-
                 }
 
               
@@ -95,8 +94,8 @@ namespace TaskManager.Controllers
                     }
 
                     _jobDbContext.BulkInsert(pagefirstList);
+                    await CreateTaskAsync(pagefirstList,_jobDbContext);
 
-               
 
                     // 计算总页数
                     int totalPages = (int)Math.Ceiling((double)totalItems / pageSize);
@@ -122,6 +121,7 @@ namespace TaskManager.Controllers
                                     entity.CreationTime = DateTime.Now;
                                     pageList.Add(entity);
                                     allData.Add(itm);
+
                                 }
                             }
                             else
@@ -137,10 +137,8 @@ namespace TaskManager.Controllers
                                 }
                             }
 
-
-
-
                             _jobDbContext.BulkInsert(pageList);
+                            await CreateTaskAsync(pageList, _jobDbContext);
                             await _logger.AddInfo($"成功获取 {pageResponse.Data.Rows.Count} 条记录", TaskName);
                         }
                         else
@@ -204,6 +202,7 @@ namespace TaskManager.Controllers
                         }
                     }
                     _jobDbContext.BulkInsert(pagefirstList);
+                    await CreateTaskAsync(pagefirstList, _jobDbContext);
                     //Console.WriteLine($"总记录数: {totalItems}, 每页大小: {pageSize}");
                     // 计算总页数
                     int totalPages = (int)Math.Ceiling((double)totalItems / pageSize);
@@ -243,6 +242,7 @@ namespace TaskManager.Controllers
                                 }
                             }
                             _jobDbContext.BulkInsert(pageList);
+                            await CreateTaskAsync(pageList, _jobDbContext);
                             await _logger.AddInfo($"成功获取 {pageResponse.Data.Rows.Count} 条记录", TaskName);
                         }
                         else

API/Wood.Service/Controllers/CherySupplierConDateService.cs

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

API/Wood.Service/Controllers/CherySupplierConMmrpService.cs

@@ -0,0 +1,12 @@
+using TaskManager.Entity.Entitys;
+using TaskManager.EntityFramework;
+
+namespace TaskManager.Controllers
+{
+    public class CherySupplierConMmrpService : CheryRecurringJobInputPageController<SUPPLIER_CON_MMRP, SUPPLIER_CON_MMRP_DTO>
+    {
+        public CherySupplierConMmrpService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_CON_MMRP> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+        }
+    }
+}

API/Wood.Service/Controllers/NormalBaseController.cs

@@ -17,13 +17,14 @@ using Microsoft.Extensions.DependencyInjection;
 using TaskManager.Entity;
 using TaskManager.EntityFramework;
 using TaskManager.EntityFramework.Repository;
+using Wood.Entity;
 using Wood.Util;
 
 
 namespace Wood.Service.Controllers
 {
     [AllowAnonymous]
-    public  class NormalBaseController<T>:ControllerBase where T:BaseEntity ,new()
+    public  class NormalBaseController<T>:ControllerBase,IScoped where T:BaseEntity ,new()
     {
 
         protected readonly JobDbContext _context;

API/Wood.Service/Controllers/SupplierConDateService.cs

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

API/Wood.Service/Controllers/SupplierConMmrpService.cs

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

API/Wood.Service/Controllers/TaskConifgureController.cs

@@ -521,7 +521,7 @@ namespace TaskManager.Controllers
                         );
                         break;
                     case "M+6月物料需求计划风险确认":
-                        RecurringJob.AddOrUpdate<SupplierConMmrpService>(
+                        RecurringJob.AddOrUpdate<CherySupplierConMmrpService>(
                             task.TaskName,
                             x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName, client),
                             task.Corn,