diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_BOM_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_BOM_DTO.cs index 88930bc..4740dce 100644 --- a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_BOM_DTO.cs +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_BOM_DTO.cs @@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos /// /// BOM主数据 /// - public class SUPPLIER_BOM_DTO : BaseEntityDto + public class SUPPLIER_BOM_DTO { /// /// 供应商代码 diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_EMPLOYEE_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_EMPLOYEE_DTO.cs index ef6283d..fec5022 100644 --- a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_EMPLOYEE_DTO.cs +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_EMPLOYEE_DTO.cs @@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos /// /// 人员资质信息 /// - public class SUPPLIER_EMPLOYEE_DTO : BaseEntityDto + public class SUPPLIER_EMPLOYEE_DTO { /// /// 供应商代码 diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_INFO_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_INFO_DTO.cs index 52172a5..83c6f2a 100644 --- a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_INFO_DTO.cs +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_INFO_DTO.cs @@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos /// /// 供应商基础信息 /// - public class SUPPLIER_INFO_DTO : BaseEntityDto + public class SUPPLIER_INFO_DTO { /// /// 供应商代码 diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_CPS_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_CPS_DTO.cs index 4fd283e..1531b03 100644 --- a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_CPS_DTO.cs +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_CPS_DTO.cs @@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos /// /// 过程控制项质量数据 /// - public class SUPPLIER_PRO_CPS_DTO : BaseEntityDto + public class SUPPLIER_PRO_CPS_DTO { /// /// 供应商代码 diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_DATA_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_DATA_DTO.cs index 09206b6..6821711 100644 --- a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_DATA_DTO.cs +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_DATA_DTO.cs @@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos /// /// 生产过程数据 /// - public class SUPPLIER_PRO_DATA_DTO : BaseEntityDto + public class SUPPLIER_PRO_DATA_DTO { /// /// 供应商代码 diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_FIRST_PASSYIELD_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_FIRST_PASSYIELD_DTO.cs index 31bf021..0ce37a1 100644 --- a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_FIRST_PASSYIELD_DTO.cs +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_FIRST_PASSYIELD_DTO.cs @@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos /// /// 产品一次合格率 /// - public class SUPPLIER_PRO_FIRST_PASSYIELD_DTO : BaseEntityDto + public class SUPPLIER_PRO_FIRST_PASSYIELD_DTO { /// /// 供应商代码 diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_MATERIAL_STOCK_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_MATERIAL_STOCK_DTO.cs index af574b4..8fb79c4 100644 --- a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_MATERIAL_STOCK_DTO.cs +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_MATERIAL_STOCK_DTO.cs @@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos /// /// 来料检验数据 /// - public class SUPPLIER_PRO_MATERIAL_STOCK_DTO : BaseEntityDto + public class SUPPLIER_PRO_MATERIAL_STOCK_DTO { /// /// 供应商代码 diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_SCHEDULING_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_SCHEDULING_DTO.cs index 2a2ef28..d899378 100644 --- a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_SCHEDULING_DTO.cs +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_SCHEDULING_DTO.cs @@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos /// /// 排产数据 /// - public class SUPPLIER_PRO_SCHEDULING_DTO : BaseEntityDto + public class SUPPLIER_PRO_SCHEDULING_DTO { /// /// 供应商代码 diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO.cs index 95bd4f6..ad62b3b 100644 --- a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO.cs +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO.cs @@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos /// /// 工位一次合格率 /// - public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO : BaseEntityDto + public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO { /// /// 供应商代码 diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs index e6da44c..20b8c83 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs @@ -36,6 +36,10 @@ namespace TaskManager.Controllers + + + + /// /// 手工发送调用接口 /// diff --git a/API/Wood.Service/Controllers/CherySupplierBomService.cs b/API/Wood.Service/Controllers/CherySupplierBomService.cs new file mode 100644 index 0000000..240348f --- /dev/null +++ b/API/Wood.Service/Controllers/CherySupplierBomService.cs @@ -0,0 +1,14 @@ +using TaskManager.Contracts.Dtos; +using TaskManager.Entity; +using TaskManager.Entity.Entitys; +using TaskManager.EntityFramework; + +namespace TaskManager.Controllers +{ + public class CherySupplierBomService : CheryRecurringJobInputPageController + { + public CherySupplierBomService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository) + { + } + } +} diff --git a/API/Wood.Service/Controllers/SupplierBomService.cs b/API/Wood.Service/Controllers/SupplierBomService.cs deleted file mode 100644 index 1baae75..0000000 --- a/API/Wood.Service/Controllers/SupplierBomService.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace TaskManager.Controllers -{ - public class SupplierBomService - { - } -} diff --git a/API/Wood.Service/Controllers/TaskConifgureController.cs b/API/Wood.Service/Controllers/TaskConifgureController.cs index 4ed0720..d615d28 100644 --- a/API/Wood.Service/Controllers/TaskConifgureController.cs +++ b/API/Wood.Service/Controllers/TaskConifgureController.cs @@ -22,7 +22,9 @@ namespace TaskManager.Controllers { //[ApiController] //[Route("[controller]")] - + /// + /// 任务设置服务 + /// [AllowAnonymous] public class TaskConifgureController :NormalBaseController { @@ -267,8 +269,6 @@ namespace TaskManager.Controllers var path = task.Api; var client = task.Client; - - switch (task.TaskName) { //case "来料检验数据": diff --git a/API/Wood.Service/Controllers/TaskSubService.cs b/API/Wood.Service/Controllers/TaskSubService.cs index 46d914c..a7a1ebf 100644 --- a/API/Wood.Service/Controllers/TaskSubService.cs +++ b/API/Wood.Service/Controllers/TaskSubService.cs @@ -1,18 +1,208 @@ -using System; +using Hangfire; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using System; using System.Collections.Generic; using System.Linq; + using System.Text; using System.Threading.Tasks; -using Microsoft.Extensions.Configuration; +using TaskManager.Contracts.Dtos; +using TaskManager.Controllers; using TaskManager.Entity; using TaskManager.EntityFramework; +using TaskManager.EntityFramework.Repository; +using Wood.Util.Filters; +using Z.EntityFramework.Plus; namespace Wood.Service.Controllers { public class TaskSubService : NormalBaseController { + + + public TaskSubService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository repository) : base(context, builder, configuration, repository) { } + + + //private async Task> GetDataPagedAsync(RequestInputBase input) + // where T : BaseEntity,new() + // where TService :CheryRecurringJobInputPageController ,new() + // where TDTO : class ,new() + //{ + // var service = _builder.GetRequiredService(); + // var task = input.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + // input.Condition.Filters.Remove(task); + // var result = await service.GetDataPaged(input); + // return result.Value; + //} + + [HttpGet] + public async Task GetDetail([FromBody] RequestInputBase requestInputBase) + { + + var taskid = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TaskId").Value; + var tablename = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName").Value; + + switch (tablename) + { + case "SUPPLIER_PRO_MATERIAL_STOCK": + + + + //_builder.GetRequiredService(requestInputBase); + + + break; + case "SUPPLIER_PRO_SCHEDULING": + //RecurringJob.AddOrUpdate<>( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + //); + break; + case "SUPPLIER_INFO": + //RecurringJob.AddOrUpdate<>( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + //); + break; + case "SUPPLIER_EMPLOYEE"://人员资质信息 + //RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + //); + break; + case "SUPPLIER_BOM"://BOM主数据 + + var bomservice = _builder.GetRequiredService(); + var bomtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(bomtask); + var bomresult = await bomservice.GetDataPaged(requestInputBase); + return Ok(bomresult.Value); + + + case "SUPPLIER_PRO_CPS"://过程控制项质量数据 + //var service = _builder.GetRequiredService(); + //var task = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + //requestInputBase.Condition.Filters.Remove(task); + //var result = await service.GetDataPaged(requestInputBase); + //return Ok(result.Value); + + + + + + + //RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + //); + break; + case "SUPPLIER_PRO_DATA": + //RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + //); + break; + case "SUPPLIER_PRO_FIRST_PASSYIELD": + //RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + //); + break; + case "SUPPLIER_PRO_STATION_FIRST_PASSYIELD": + //RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + //); + break; + case "SUPPLIER_PRO_FLAW": + //RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + //); + break; + case "SUPPLIER_PRO_ENVIRONMENT": + //RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + //); + break; + case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE": + //RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + //); + break; + case "SUPPLIER_PRO_OEE_TIME_DETAILS": + //RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + //); + break; + case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据 + //RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + //); + break; + case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备 + + //RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + //); + break; + case "SUPPLIER_PRO_PROCESS"://工艺 + //RecurringJob.AddOrUpdate<>( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + //); + break; + + + + } + return Ok(); + } + } + + + + + + + }