diff --git a/API/TaskManager.Entity/Entity.cs b/API/TaskManager.Entity/Entity.cs index 6fc2b37..64e05bd 100644 --- a/API/TaskManager.Entity/Entity.cs +++ b/API/TaskManager.Entity/Entity.cs @@ -226,26 +226,30 @@ namespace TaskManager.Entity public class TaskSub:BaseEntity { [ExporterHeader(DisplayName = "表名")] + [MaxLength(30)] /// /// 关联的数据表名称(如:订单表、用户表等,可为空) /// public string? TableName { get; set; } [ExporterHeader(DisplayName = "任务名称")] + [MaxLength(30)] /// /// 任务名称(用于业务层面标识任务,如:数据同步任务、报表生成任务) /// public string? TaskName { get; set; } [ExporterHeader(DisplayName = "同步总数量")] + /// /// 数据总量(任务处理的数据条目数) /// public int DataCount { get; set; } [ExporterHeader(DisplayName = "客户名")] + [MaxLength(30)] /// /// 发布给那个客户 /// public string? Subscriber { get; set; } - [ExporterHeader(DisplayName = "失败次数")] + /// /// 失败次数(任务执行失败的累计次数) /// @@ -255,20 +259,24 @@ namespace TaskManager.Entity /// 失败详情(记录失败原因、异常堆栈等信息,支持长文本) /// [ExporterHeader(DisplayName = "失败信息")] + [MaxLength(30)] public string? FailedInfo { get; set; } /// /// 所属域(多租户场景下标识租户,如:租户A、租户B) /// [ExporterHeader(DisplayName = "域名")] + [MaxLength(30)] public string? Domain { get; set; } /// /// 站点标识(多站点部署时标识所属站点,如:Site1、Site2) /// [ExporterHeader(DisplayName = "站点")] + [MaxLength(30)] public string Site { get; set; } [ExporterHeader(DisplayName = "创建用户")] + [MaxLength(30)] /// /// 从那个内部系统创建系统 /// @@ -284,6 +292,7 @@ namespace TaskManager.Entity /// public string? Remark { get; set; } [ExporterHeader(DisplayName = "更新客户系统名")] + [MaxLength(30)] /// /// 最后更新人(记录任务最后修改者) /// diff --git a/API/TaskManager.EntityFramework/Repository/Repository.cs b/API/TaskManager.EntityFramework/Repository/Repository.cs index 6a34dfa..5bf1c6f 100644 --- a/API/TaskManager.EntityFramework/Repository/Repository.cs +++ b/API/TaskManager.EntityFramework/Repository/Repository.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore; +using OfficeOpenXml.FormulaParsing.Excel.Functions.Math; using Serilog; using System; using System.Collections.Generic; @@ -47,7 +48,14 @@ namespace TaskManager.EntityFramework.Repository public async Task UpdateAsync(TEntity entity) { - + + + //product 已前台更新后 + + _context.Attach(entity); + _context.Entry(entity).State = EntityState.Modified; + + _dbSet.Update(entity); await _context.SaveChangesAsync(); } diff --git a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs index a70ca64..a696bd3 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs @@ -253,6 +253,8 @@ namespace TaskManager.Controllers { T entity = new T(); entity.InjectFrom(itm); + + entity.CreationTime = DateTime.Now; pageList.Add(entity); allData.Add(itm); diff --git a/API/Wood.Service/Controllers/TaskSubService.cs b/API/Wood.Service/Controllers/TaskSubService.cs index a7a1ebf..af8a13b 100644 --- a/API/Wood.Service/Controllers/TaskSubService.cs +++ b/API/Wood.Service/Controllers/TaskSubService.cs @@ -51,36 +51,44 @@ namespace Wood.Service.Controllers { case "SUPPLIER_PRO_MATERIAL_STOCK": + 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); + + + - //_builder.GetRequiredService(requestInputBase); + //_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; + + var schedservice = _builder.GetRequiredService(); + var schedtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(schedtask); + var schedresult = await schedservice.GetDataPaged(requestInputBase); + return Ok(schedresult.Value); + case "SUPPLIER_INFO": - //RecurringJob.AddOrUpdate<>( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - //); - break; + + var infoservice = _builder.GetRequiredService(); + var infotask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(infotask); + var inforesult = await infoservice.GetDataPaged(requestInputBase); + return Ok(inforesult.Value); + case "SUPPLIER_EMPLOYEE"://人员资质信息 - //RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - //); - break; + var emplyeeservice = _builder.GetRequiredService(); + var emplyeetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(emplyeetask); + var emplyeeresult = await emplyeeservice.GetDataPaged(requestInputBase); + return Ok(emplyeeresult.Value); + + case "SUPPLIER_BOM"://BOM主数据 var bomservice = _builder.GetRequiredService(); @@ -91,104 +99,83 @@ namespace Wood.Service.Controllers 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); + var cpsservice = _builder.GetRequiredService(); + var cpstask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(cpstask); + var result = await cpsservice.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; + 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_FIRST_PASSYIELD": - //RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - //); - break; + + var passyieldservice = _builder.GetRequiredService(); + var passyieldtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(passyieldtask); + var passyieldresult = await passyieldservice.GetDataPaged(requestInputBase); + return Ok(passyieldresult.Value); + + case "SUPPLIER_PRO_STATION_FIRST_PASSYIELD": - //RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - //); - break; + var pasyservice = _builder.GetRequiredService(); + var pasytask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(pasytask); + var pasyresult = await pasyservice.GetDataPaged(requestInputBase); + return Ok(pasyresult.Value); + case "SUPPLIER_PRO_FLAW": - //RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - //); - break; + var flawservice = _builder.GetRequiredService(); + var flawtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(flawtask); + var flawresult = await flawservice.GetDataPaged(requestInputBase); + return Ok(flawresult.Value); + case "SUPPLIER_PRO_ENVIRONMENT": - //RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - //); - break; + 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": - //RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - //); + 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": - //RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - //); + 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"://物料主数据 - //RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - //); + 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":// 工艺装备 - - //RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - //); + 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"://工艺 - //RecurringJob.AddOrUpdate<>( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - //); + 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;