From 7ab9e6ec7252e81d493e4be3da7ffabbe208838c Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Thu, 5 Jun 2025 15:26:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9D=A5=E6=96=99?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=95=B0=E6=8D=AEDTO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CherySupplierProMaterialStockService.cs | 17 +++++++++++++++++ .../SUPPLIER_PRO_MATERIAL_STOCK_Service.cs | 6 ------ .../Controllers/TaskConifgureController.cs | 16 ++++++++-------- 3 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 API/Wood.Service/Controllers/CherySupplierProMaterialStockService.cs delete mode 100644 API/Wood.Service/Controllers/SUPPLIER_PRO_MATERIAL_STOCK_Service.cs diff --git a/API/Wood.Service/Controllers/CherySupplierProMaterialStockService.cs b/API/Wood.Service/Controllers/CherySupplierProMaterialStockService.cs new file mode 100644 index 0000000..d8aa80f --- /dev/null +++ b/API/Wood.Service/Controllers/CherySupplierProMaterialStockService.cs @@ -0,0 +1,17 @@ +using TaskManager.Contracts.Dtos; +using TaskManager.Entity; +using TaskManager.EntityFramework; + +namespace TaskManager.Controllers +{ + /// + /// 来料检验数据 + /// + public class SupplierProMaterialStockService : CheryRecurringJobInputPageController + { + public SupplierProMaterialStockService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository) + { + + } + } +} diff --git a/API/Wood.Service/Controllers/SUPPLIER_PRO_MATERIAL_STOCK_Service.cs b/API/Wood.Service/Controllers/SUPPLIER_PRO_MATERIAL_STOCK_Service.cs deleted file mode 100644 index 5b11b49..0000000 --- a/API/Wood.Service/Controllers/SUPPLIER_PRO_MATERIAL_STOCK_Service.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace TaskManager.Controllers -{ - public class SUPPLIER_PRO_MATERIAL_STOCK_Service - { - } -} diff --git a/API/Wood.Service/Controllers/TaskConifgureController.cs b/API/Wood.Service/Controllers/TaskConifgureController.cs index 8ec782c..d5e5179 100644 --- a/API/Wood.Service/Controllers/TaskConifgureController.cs +++ b/API/Wood.Service/Controllers/TaskConifgureController.cs @@ -271,14 +271,14 @@ namespace TaskManager.Controllers switch (task.TaskName) { - //case "来料检验数据": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url,path,task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; + case "来料检验数据": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName, client), + task.Corn, + TimeZoneInfo.Local + ); + break; case "排产数据": RecurringJob.AddOrUpdate( task.TaskName, From fb927c57be87af6405f816818a52def8c8e13818 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Thu, 5 Jun 2025 15:59:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=95=B0=E6=8D=AE=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CherySupplierProEnvironmentService.cs | 19 +++++++++++++++++++ .../SUPPLIER_PRO_ENVIRONMENT_Service.cs | 5 ----- .../Controllers/TaskConifgureController.cs | 16 ++++++++-------- 3 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 API/Wood.Service/Controllers/CherySupplierProEnvironmentService.cs delete mode 100644 API/Wood.Service/Controllers/SUPPLIER_PRO_ENVIRONMENT_Service.cs diff --git a/API/Wood.Service/Controllers/CherySupplierProEnvironmentService.cs b/API/Wood.Service/Controllers/CherySupplierProEnvironmentService.cs new file mode 100644 index 0000000..dba9efd --- /dev/null +++ b/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 +{ + /// + /// 环境业务数据 + /// + public class CherySupplierProEnvironmentService : CheryRecurringJobInputPageController + { + public CherySupplierProEnvironmentService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository) + { + + } + } + +} diff --git a/API/Wood.Service/Controllers/SUPPLIER_PRO_ENVIRONMENT_Service.cs b/API/Wood.Service/Controllers/SUPPLIER_PRO_ENVIRONMENT_Service.cs deleted file mode 100644 index e77d442..0000000 --- a/API/Wood.Service/Controllers/SUPPLIER_PRO_ENVIRONMENT_Service.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace TaskManager.Controllers -{ - public class SUPPLIER_PRO_ENVIRONMENT_Service { } - -} diff --git a/API/Wood.Service/Controllers/TaskConifgureController.cs b/API/Wood.Service/Controllers/TaskConifgureController.cs index 934905f..858c941 100644 --- a/API/Wood.Service/Controllers/TaskConifgureController.cs +++ b/API/Wood.Service/Controllers/TaskConifgureController.cs @@ -351,14 +351,14 @@ namespace TaskManager.Controllers TimeZoneInfo.Local ); break; - //case "环境业务数据": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; + case "环境业务数据": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName, client), + task.Corn, + TimeZoneInfo.Local + ); + break; //case "设备OEE达成率": // RecurringJob.AddOrUpdate( // task.TaskName, From 44088122f4d4fb85f503c59c1392e7cb95753370 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Thu, 5 Jun 2025 16:06:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87OEE?= =?UTF-8?q?=E8=BE=BE=E6=88=90=E7=8E=87=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...herySupplierProOeeAchievementRateService.cs | 18 ++++++++++++++++++ ...UPPLIER_PRO_OEE_ACHIEVEMENT_RATE_Service.cs | 6 ------ .../Controllers/TaskConifgureController.cs | 16 ++++++++-------- 3 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 API/Wood.Service/Controllers/CherySupplierProOeeAchievementRateService.cs delete mode 100644 API/Wood.Service/Controllers/SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_Service.cs diff --git a/API/Wood.Service/Controllers/CherySupplierProOeeAchievementRateService.cs b/API/Wood.Service/Controllers/CherySupplierProOeeAchievementRateService.cs new file mode 100644 index 0000000..f75e309 --- /dev/null +++ b/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 +{ + /// + /// 设备OEE达成率 + /// + public class CherySupplierProOeeAchievementRateService : CheryRecurringJobInputPageController + { + public CherySupplierProOeeAchievementRateService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository) + { + + } + } +} diff --git a/API/Wood.Service/Controllers/SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_Service.cs b/API/Wood.Service/Controllers/SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_Service.cs deleted file mode 100644 index 93502fc..0000000 --- a/API/Wood.Service/Controllers/SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_Service.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace TaskManager.Controllers -{ - public class SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_Service - { - } -} diff --git a/API/Wood.Service/Controllers/TaskConifgureController.cs b/API/Wood.Service/Controllers/TaskConifgureController.cs index 858c941..5c67094 100644 --- a/API/Wood.Service/Controllers/TaskConifgureController.cs +++ b/API/Wood.Service/Controllers/TaskConifgureController.cs @@ -359,14 +359,14 @@ namespace TaskManager.Controllers TimeZoneInfo.Local ); break; - //case "设备OEE达成率": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; + case "设备OEE达成率": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName, client), + task.Corn, + TimeZoneInfo.Local + ); + break; //case "OEE时间明细": // RecurringJob.AddOrUpdate( // task.TaskName, From 2d7fd80f22c3dad46fb1c89bd36c140bddc8af7f Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Thu, 5 Jun 2025 16:18:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9EOEE=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CherySupplierProOeeTimeDetailsService.cs | 18 ++++++++++++++++++ .../SUPPLIER_PRO_OEE_TIME_DETAILS_Service.cs | 6 ------ .../Controllers/TaskConifgureController.cs | 16 ++++++++-------- 3 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 API/Wood.Service/Controllers/CherySupplierProOeeTimeDetailsService.cs delete mode 100644 API/Wood.Service/Controllers/SUPPLIER_PRO_OEE_TIME_DETAILS_Service.cs diff --git a/API/Wood.Service/Controllers/CherySupplierProOeeTimeDetailsService.cs b/API/Wood.Service/Controllers/CherySupplierProOeeTimeDetailsService.cs new file mode 100644 index 0000000..e218adf --- /dev/null +++ b/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 +{ + /// + /// OEE时间明细 + /// + public class CherySupplierProOeeTimeDetailsService : CheryRecurringJobInputPageController + { + public CherySupplierProOeeTimeDetailsService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository) + { + + } + } +} diff --git a/API/Wood.Service/Controllers/SUPPLIER_PRO_OEE_TIME_DETAILS_Service.cs b/API/Wood.Service/Controllers/SUPPLIER_PRO_OEE_TIME_DETAILS_Service.cs deleted file mode 100644 index bcdd87d..0000000 --- a/API/Wood.Service/Controllers/SUPPLIER_PRO_OEE_TIME_DETAILS_Service.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace TaskManager.Controllers -{ - public class SUPPLIER_PRO_OEE_TIME_DETAILS_Service - { - } -} diff --git a/API/Wood.Service/Controllers/TaskConifgureController.cs b/API/Wood.Service/Controllers/TaskConifgureController.cs index 5c67094..70af9e2 100644 --- a/API/Wood.Service/Controllers/TaskConifgureController.cs +++ b/API/Wood.Service/Controllers/TaskConifgureController.cs @@ -367,14 +367,14 @@ namespace TaskManager.Controllers TimeZoneInfo.Local ); break; - //case "OEE时间明细": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; + case "OEE时间明细": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName, client), + task.Corn, + TimeZoneInfo.Local + ); + break; //case "物料主数据": // RecurringJob.AddOrUpdate( // task.TaskName,