From 3b85b269545442968939b80129606d32df4c2ca3 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Thu, 5 Jun 2025 16:42:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E8=A3=85=E5=A4=87=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CherySupplierProProcessEquipmentService.cs | 18 ++++++++++++++++++ .../SUPPLIER_PRO_PROCESS_EQUIPMENT_Service.cs | 6 ------ .../Controllers/TaskConifgureController.cs | 16 ++++++++-------- 3 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 API/Wood.Service/Controllers/CherySupplierProProcessEquipmentService.cs delete mode 100644 API/Wood.Service/Controllers/SUPPLIER_PRO_PROCESS_EQUIPMENT_Service.cs diff --git a/API/Wood.Service/Controllers/CherySupplierProProcessEquipmentService.cs b/API/Wood.Service/Controllers/CherySupplierProProcessEquipmentService.cs new file mode 100644 index 0000000..de0e6e0 --- /dev/null +++ b/API/Wood.Service/Controllers/CherySupplierProProcessEquipmentService.cs @@ -0,0 +1,18 @@ +using TaskManager.Contracts.Dtos; +using TaskManager.Entity; +using TaskManager.Entity.Entitys; +using TaskManager.EntityFramework; + +namespace TaskManager.Controllers +{ + /// + /// 工艺装备 + /// + public class CherySupplierProProcessEquipmentService : CheryRecurringJobInputPageController + { + public CherySupplierProProcessEquipmentService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository) + { + + } + } +} diff --git a/API/Wood.Service/Controllers/SUPPLIER_PRO_PROCESS_EQUIPMENT_Service.cs b/API/Wood.Service/Controllers/SUPPLIER_PRO_PROCESS_EQUIPMENT_Service.cs deleted file mode 100644 index 3d0968f..0000000 --- a/API/Wood.Service/Controllers/SUPPLIER_PRO_PROCESS_EQUIPMENT_Service.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace TaskManager.Controllers -{ - public class SUPPLIER_PRO_PROCESS_EQUIPMENT_Service - { - } -} diff --git a/API/Wood.Service/Controllers/TaskConifgureController.cs b/API/Wood.Service/Controllers/TaskConifgureController.cs index 301e867..e43c32f 100644 --- a/API/Wood.Service/Controllers/TaskConifgureController.cs +++ b/API/Wood.Service/Controllers/TaskConifgureController.cs @@ -383,14 +383,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 "工艺": RecurringJob.AddOrUpdate( task.TaskName, From ce98981af661275ec0090ba0c6aa638477dcece4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Thu, 5 Jun 2025 16:48:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRepository/IRepository.cs | 9 ++ .../Repository/Repository.cs | 15 +++ .../TaskManager.EntityFramework.csproj | 1 + .../Controllers/TaskSubService.cs | 97 +++++++++---------- 4 files changed, 70 insertions(+), 52 deletions(-) diff --git a/API/TaskManager.EntityFramework/IRepository/IRepository.cs b/API/TaskManager.EntityFramework/IRepository/IRepository.cs index 2244f0e..20f1727 100644 --- a/API/TaskManager.EntityFramework/IRepository/IRepository.cs +++ b/API/TaskManager.EntityFramework/IRepository/IRepository.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using TaskManager.Entity; using TaskManager.EntityFramework.Repository; using Wood.Util.Filters; +using Z.BulkOperations; namespace TaskManager.EntityFramework { @@ -19,6 +20,14 @@ namespace TaskManager.EntityFramework Task UpdateAsync(TEntity entity); Task DeleteAsync(long id); + /// + /// 批量合拼 + /// + /// + /// + Task BlukMergeAsync(List entities, Action> action); + + Task BlukInsertAsync(List entities, Action> action); Task> GetPagedAsync(PagingParams pagingParams); diff --git a/API/TaskManager.EntityFramework/Repository/Repository.cs b/API/TaskManager.EntityFramework/Repository/Repository.cs index 337188d..6d1a41d 100644 --- a/API/TaskManager.EntityFramework/Repository/Repository.cs +++ b/API/TaskManager.EntityFramework/Repository/Repository.cs @@ -12,6 +12,7 @@ using TaskManager.Entity; using TaskManager.EntityFramework; using Wood.Util; using Wood.Util.Filters; +using Z.BulkOperations; namespace TaskManager.EntityFramework.Repository { @@ -66,6 +67,20 @@ namespace TaskManager.EntityFramework.Repository } } + public async Task BlukMergeAsync(List entities,Action> action) + { + _context.BulkMerge(entities, action); + } + + + public async Task BlukInsertAsync(List entities, Action> action) + { + _context.BulkInsert(entities, action); + } + + + + public async Task> GetPagedAsync(PagingParams pagingParams) { return await _dbSet.AsNoTracking().ToPagedListAsync(pagingParams); diff --git a/API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj b/API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj index 3236ca0..9b1e421 100644 --- a/API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj +++ b/API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj @@ -18,6 +18,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/API/Wood.Service/Controllers/TaskSubService.cs b/API/Wood.Service/Controllers/TaskSubService.cs index af8a13b..dfbd424 100644 --- a/API/Wood.Service/Controllers/TaskSubService.cs +++ b/API/Wood.Service/Controllers/TaskSubService.cs @@ -27,7 +27,6 @@ namespace Wood.Service.Controllers { } - //private async Task> GetDataPagedAsync(RequestInputBase input) // where T : BaseEntity,new() // where TService :CheryRecurringJobInputPageController ,new() @@ -54,17 +53,11 @@ namespace Wood.Service.Controllers var stockservice = _builder.GetRequiredService(); var stocktask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(stocktask); - var schedresult = await schedservice.GetDataPaged(requestInputBase); - return Ok(schedresult.Value); - - - - - + var stockresult = await stockservice.GetDataPaged(requestInputBase); + return Ok(stockresult.Value); - - //_builder.GetRequiredService(requestInputBase); - break; + + case "SUPPLIER_PRO_SCHEDULING": var schedservice = _builder.GetRequiredService(); @@ -135,48 +128,48 @@ namespace Wood.Service.Controllers var flawresult = await flawservice.GetDataPaged(requestInputBase); return Ok(flawresult.Value); - case "SUPPLIER_PRO_ENVIRONMENT": - var dataservice = _builder.GetRequiredService(); - var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); - requestInputBase.Condition.Filters.Remove(datatask); - var dataresult = await dataservice.GetDataPaged(requestInputBase); - return Ok(dataresult.Value); + //case "SUPPLIER_PRO_ENVIRONMENT": + // var dataservice = _builder.GetRequiredService(); + // var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + // requestInputBase.Condition.Filters.Remove(datatask); + // var dataresult = await dataservice.GetDataPaged(requestInputBase); + // return Ok(dataresult.Value); - case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE": - var rateservice = _builder.GetRequiredService<>(); - var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); - requestInputBase.Condition.Filters.Remove(datatask); - var tateresult = await dataservice.GetDataPaged(requestInputBase); - return Ok(dataresult.Value); - break; - case "SUPPLIER_PRO_OEE_TIME_DETAILS": - var detailservice = _builder.GetRequiredService<>(); - var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); - requestInputBase.Condition.Filters.Remove(datatask); - var detailresult = await dataservice.GetDataPaged(requestInputBase); - return Ok(dataresult.Value); - break; - case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据 - var dataservice = _builder.GetRequiredService<>(); - var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); - requestInputBase.Condition.Filters.Remove(datatask); - var dataresult = await dataservice.GetDataPaged(requestInputBase); - return Ok(dataresult.Value); - break; - case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备 - var dataservice = _builder.GetRequiredService(); - var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); - requestInputBase.Condition.Filters.Remove(datatask); - var dataresult = await dataservice.GetDataPaged(requestInputBase); - return Ok(dataresult.Value); - break; - case "SUPPLIER_PRO_PROCESS"://工艺 - var dataservice = _builder.GetRequiredService(); - var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); - requestInputBase.Condition.Filters.Remove(datatask); - var dataresult = await dataservice.GetDataPaged(requestInputBase); - return Ok(dataresult.Value); - break; + //case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE": + // var rateservice = _builder.GetRequiredService<>(); + // var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + // requestInputBase.Condition.Filters.Remove(datatask); + // var tateresult = await dataservice.GetDataPaged(requestInputBase); + // return Ok(dataresult.Value); + // break; + //case "SUPPLIER_PRO_OEE_TIME_DETAILS": + // var detailservice = _builder.GetRequiredService<>(); + // var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + // requestInputBase.Condition.Filters.Remove(datatask); + // var detailresult = await dataservice.GetDataPaged(requestInputBase); + // return Ok(dataresult.Value); + // break; + //case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据 + // var dataservice = _builder.GetRequiredService<>(); + // var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + // requestInputBase.Condition.Filters.Remove(datatask); + // var dataresult = await dataservice.GetDataPaged(requestInputBase); + // return Ok(dataresult.Value); + // break; + //case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备 + // var dataservice = _builder.GetRequiredService(); + // var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + // requestInputBase.Condition.Filters.Remove(datatask); + // var dataresult = await dataservice.GetDataPaged(requestInputBase); + // return Ok(dataresult.Value); + // break; + //case "SUPPLIER_PRO_PROCESS"://工艺 + // var dataservice = _builder.GetRequiredService(); + // var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + // requestInputBase.Condition.Filters.Remove(datatask); + // var dataresult = await dataservice.GetDataPaged(requestInputBase); + // return Ok(dataresult.Value); + // break; From f5a6df1c39d1b1e315e617aa0ffd813056b809bf Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Thu, 5 Jun 2025 16:50:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=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 --- .../CherySupplierProAttachmentDataService.cs | 15 +++++++++++++++ .../SUPPLIER_PRO_ATTACHMENT_DATA_Service.cs | 6 ------ .../Controllers/TaskConifgureController.cs | 8 ++++++++ 3 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 API/Wood.Service/Controllers/CherySupplierProAttachmentDataService.cs delete mode 100644 API/Wood.Service/Controllers/SUPPLIER_PRO_ATTACHMENT_DATA_Service.cs diff --git a/API/Wood.Service/Controllers/CherySupplierProAttachmentDataService.cs b/API/Wood.Service/Controllers/CherySupplierProAttachmentDataService.cs new file mode 100644 index 0000000..94be581 --- /dev/null +++ b/API/Wood.Service/Controllers/CherySupplierProAttachmentDataService.cs @@ -0,0 +1,15 @@ +using TaskManager.Contracts.Dtos; +using TaskManager.Entity; +using TaskManager.Entity.Entitys; +using TaskManager.EntityFramework; + +namespace TaskManager.Controllers +{ + public class CherySupplierProAttachmentDataService : CheryRecurringJobInputPageController + { + public CherySupplierProAttachmentDataService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository) + { + + } + } +} diff --git a/API/Wood.Service/Controllers/SUPPLIER_PRO_ATTACHMENT_DATA_Service.cs b/API/Wood.Service/Controllers/SUPPLIER_PRO_ATTACHMENT_DATA_Service.cs deleted file mode 100644 index a744872..0000000 --- a/API/Wood.Service/Controllers/SUPPLIER_PRO_ATTACHMENT_DATA_Service.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace TaskManager.Controllers -{ - public class SUPPLIER_PRO_ATTACHMENT_DATA_Service - { - } -} diff --git a/API/Wood.Service/Controllers/TaskConifgureController.cs b/API/Wood.Service/Controllers/TaskConifgureController.cs index e43c32f..1d09ffe 100644 --- a/API/Wood.Service/Controllers/TaskConifgureController.cs +++ b/API/Wood.Service/Controllers/TaskConifgureController.cs @@ -383,6 +383,14 @@ namespace TaskManager.Controllers 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,