zhibinlv
/
QRAPI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改任务和日志读取服务

master
赵新宇 2 days ago
parent
98d531a288
commit
0c130995f0
2 changed files with 36 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
  2. 53
      API/Wood.Service/Controllers/TaskSubService.cs

13
API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
View File

@ -23,6 +23,7 @@ using System.Security.Policy;
using System.Text; using System.Text;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using System.Threading.Tasks;
using TaskManager.Contracts.Dtos; using TaskManager.Contracts.Dtos;
using TaskManager.Entity; using TaskManager.Entity;
using TaskManager.EntityFramework; using TaskManager.EntityFramework;
@ -223,6 +224,7 @@ namespace TaskManager.Controllers
var entites = _jobDbContext.Database.GetDbConnection().Query<T>(querystr);//明细表 var entites = _jobDbContext.Database.GetDbConnection().Query<T>(querystr);//明细表
if (entites.Any()) if (entites.Any())
{ {
var total = entites.Count(); var total = entites.Count();
sub.DataCount = total; sub.DataCount = total;
int totalPages = (int)Math.Ceiling((double)total / pageSize); int totalPages = (int)Math.Ceiling((double)total / pageSize);
@ -265,8 +267,13 @@ namespace TaskManager.Controllers
List<TLOGS> logs = new List<TLOGS>(); List<TLOGS> logs = new List<TLOGS>();
foreach (var itm in records) foreach (var itm in records)
{ {
TLOGS entity = new TLOGS(); TLOGS log = new TLOGS();
logs.Add(entity); log.InjectFrom(itm);
log.RequestDate = requestDate;
log.TaskId = sub.TaskId;
log.WriteState = true;
log.ReadState = true;
logs.Add(log);
} }
_jobDbContext.BulkInsert(logs, options => options.UseTableLock = true); _jobDbContext.BulkInsert(logs, options => options.UseTableLock = true);
sub.SyncedPageCount = i; sub.SyncedPageCount = i;
@ -323,7 +330,7 @@ namespace TaskManager.Controllers
if (errorNumber> 0) if (errorNumber> 0)
{ {
await _logger.AddError($"奇瑞{sub.TaskId}任务失败，请检查数据。", TaskName, sub.TaskId, version); await _logger.AddError($"奇瑞{sub.TaskId}任务失败，请检查数据。", TaskName, sub.TaskId, version);
sub.FailedCount = errorNumber * pageSize; sub.FailedCount = errorNumber>totalPages? totalPages* pageSize: errorNumber * pageSize;
sub.FailedInfo = $"奇瑞{sub.TaskId}任务失败{errorlist.FirstOrDefault()}，请检查数据。"; sub.FailedInfo = $"奇瑞{sub.TaskId}任务失败{errorlist.FirstOrDefault()}，请检查数据。";
sub.WriteState = true; sub.WriteState = true;
_jobDbContext.Set<TaskSub>().Update(sub); _jobDbContext.Set<TaskSub>().Update(sub);

53
API/Wood.Service/Controllers/TaskSubService.cs
View File

@ -67,37 +67,36 @@ namespace Wood.Service.Controllers
return Ok(stockresult); return Ok(stockresult);
case "SUPPLIER_PRO_SCHEDULING"://排产数据 case "SUPPLIER_PRO_SCHEDULING"://排产数据
var schedservice = _builder.GetRequiredService<CherySupplierProSchedulingService>(); var schedservice = _builder.GetRequiredService<CherySupplierProSchedulingLogService>();
var schedtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); var schedtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(schedtask); requestInputBase.Condition.Filters.Remove(schedtask);
var schedresult = await schedservice.GetTaskDataPaged(requestInputBase); var schedresult = await schedservice.GetLogDataPaged(requestInputBase);
return Ok(schedresult); return Ok(schedresult);
case "SUPPLIER_INFO"://供应商基础信息 case "SUPPLIER_INFO"://供应商基础信息
var infoservice = _builder.GetRequiredService<CherySupplierInfoService>(); var infoservice = _builder.GetRequiredService<CherySupplierInfoLogService>();
var infotask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); var infotask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(infotask); requestInputBase.Condition.Filters.Remove(infotask);
var inforesult = await infoservice.GetTaskDataPaged(requestInputBase); var inforesult = await infoservice.GetLogDataPaged(requestInputBase);
return Ok(inforesult); return Ok(inforesult);
case "SUPPLIER_EMPLOYEE"://人员资质信息 case "SUPPLIER_EMPLOYEE"://人员资质信息
var emplyeeservice = _builder.GetRequiredService<CherySupplierEmployeeService>(); var emplyeeservice = _builder.GetRequiredService<CherySupplierEmployeeLogService>();
var emplyeetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); var emplyeetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(emplyeetask); requestInputBase.Condition.Filters.Remove(emplyeetask);
var emplyeeresult = await emplyeeservice.GetTaskDataPaged(requestInputBase); var emplyeeresult = await emplyeeservice.GetLogDataPaged(requestInputBase);
return Ok(emplyeeresult); return Ok(emplyeeresult);
case "SUPPLIER_BOM"://BOM主数据 case "SUPPLIER_BOM"://BOM主数据
var bomservice = _builder.GetRequiredService<CherySupplierBomService>(); var bomservice = _builder.GetRequiredService<CherySupplierBomLogService>();
var bomtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); var bomtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(bomtask); requestInputBase.Condition.Filters.Remove(bomtask);
var bomresult = await bomservice.GetTaskDataPaged(requestInputBase); var bomresult = await bomservice.GetLogDataPaged(requestInputBase);
return Ok(bomresult); return Ok(bomresult);
case "SUPPLIER_PRO_CPS"://过程控制项质量数据 case "SUPPLIER_PRO_CPS"://过程控制项质量数据
var cpsservice = _builder.GetRequiredService<CherySupplierProCpsLogService>(); var cpsservice = _builder.GetRequiredService<CherySupplierProCpsLogService>();
var cpstask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); var cpstask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
@ -129,66 +128,66 @@ namespace Wood.Service.Controllers
return Ok(pasyresult); return Ok(pasyresult);
case "SUPPLIER_PRO_FLAW"://缺陷业务数据 case "SUPPLIER_PRO_FLAW"://缺陷业务数据
var flawservice = _builder.GetRequiredService<CherySupplierProFlawService>(); var flawservice = _builder.GetRequiredService<CherySupplierProFlawLogService>();
var flawtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); var flawtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(flawtask); requestInputBase.Condition.Filters.Remove(flawtask);
var flawresult = await flawservice.GetLogDataPaged(requestInputBase); var flawresult = await flawservice.GetLogDataPaged(requestInputBase);
return Ok(flawresult); return Ok(flawresult);
case "SUPPLIER_PRO_ENVIRONMENT"://环境业务数据 case "SUPPLIER_PRO_ENVIRONMENT"://环境业务数据
var envservice = _builder.GetRequiredService<CherySupplierProEnvironmentService>(); var envservice = _builder.GetRequiredService<CherySupplierProEnvironmentLogService>();
var envtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); var envtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(envtask); requestInputBase.Condition.Filters.Remove(envtask);
var envresult = await envservice.GetTaskDataPaged(requestInputBase); var envresult = await envservice.GetLogDataPaged(requestInputBase);
return Ok(envresult); return Ok(envresult);
case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE"://设备OEE达成率 case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE"://设备OEE达成率
var rateservice = _builder.GetRequiredService<CherySupplierProOeeAchievementRateService>(); var rateservice = _builder.GetRequiredService<CherySupplierProOeeAchievementRateLogService>();
var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(ratetask); requestInputBase.Condition.Filters.Remove(ratetask);
var rateresult = await rateservice.GetTaskDataPaged(requestInputBase); var rateresult = await rateservice.GetLogDataPaged(requestInputBase);
return Ok(rateresult); return Ok(rateresult);
case "SUPPLIER_PRO_OEE_TIME_DETAILS"://OEE时间明细 case "SUPPLIER_PRO_OEE_TIME_DETAILS"://OEE时间明细
var detailservice = _builder.GetRequiredService<CherySupplierProOeeTimeDetailsService>(); var detailservice = _builder.GetRequiredService<CherySupplierProOeeTimeDetailsLogService>();
var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(detailtask); requestInputBase.Condition.Filters.Remove(detailtask);
var detailresult = await detailservice.GetTaskDataPaged(requestInputBase); var detailresult = await detailservice.GetLogDataPaged(requestInputBase);
return Ok(detailresult); return Ok(detailresult);
case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据 case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据
var materialservice = _builder.GetRequiredService<CherySupplierProMaterialDataService>(); var materialservice = _builder.GetRequiredService<CherySupplierProMaterialDataLogService>();
var materialtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); var materialtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(materialtask); requestInputBase.Condition.Filters.Remove(materialtask);
var materialresult = await materialservice.GetTaskDataPaged(requestInputBase); var materialresult = await materialservice.GetLogDataPaged(requestInputBase);
return Ok(materialresult); return Ok(materialresult);
case "SUPPLIER_PRO_ATTACHMENT_DATA":// 附件类数据 case "SUPPLIER_PRO_ATTACHMENT_DATA":// 附件类数据
var attachment_dataservice = _builder.GetRequiredService<CherySupplierProAttachmentDataService>(); var attachment_dataservice = _builder.GetRequiredService<CherySupplierProAttachmentDataLogService>();
var attachment_datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); var attachment_datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(attachment_datatask); requestInputBase.Condition.Filters.Remove(attachment_datatask);
var attachment_dataresult = await attachment_dataservice.GetTaskDataPaged(requestInputBase); var attachment_dataresult = await attachment_dataservice.GetLogDataPaged(requestInputBase);
return Ok(attachment_dataresult); return Ok(attachment_dataresult);
case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备 case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备
var eqservice = _builder.GetRequiredService<CherySupplierProProcessEquipmentService>(); var eqservice = _builder.GetRequiredService<CherySupplierProProcessEquipmentLogService>();
var eqtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); var eqtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(eqtask); requestInputBase.Condition.Filters.Remove(eqtask);
var eqresult = await eqservice.GetTaskDataPaged(requestInputBase); var eqresult = await eqservice.GetLogDataPaged(requestInputBase);
return Ok(eqresult); return Ok(eqresult);
case "SUPPLIER_PRO_PROCESS"://工艺 case "SUPPLIER_PRO_PROCESS"://工艺
var processservice = _builder.GetRequiredService<CherySupplierProProcessService>(); var processservice = _builder.GetRequiredService<CherySupplierProProcessLogService>();
var processtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); var processtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(processtask); requestInputBase.Condition.Filters.Remove(processtask);
var processresult = await processservice.GetTaskDataPaged(requestInputBase); var processresult = await processservice.GetLogDataPaged(requestInputBase);
return Ok(processresult); return Ok(processresult);
case "SUPPLIER_CON_MMRP"://M+6月物料需求计划风险确认 case "SUPPLIER_CON_MMRP"://M+6月物料需求计划风险确认
var mmrpservice = _builder.GetRequiredService<CherySupplierConMmrpService>(); var mmrpservice = _builder.GetRequiredService<CherySupplierConMmrpLogService>();
var mmrptask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); var mmrptask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(mmrptask); requestInputBase.Condition.Filters.Remove(mmrptask);
var mmrpresult = await mmrpservice.GetTaskDataPaged(requestInputBase); var mmrpresult = await mmrpservice.GetLogDataPaged(requestInputBase);
return Ok(mmrpresult); return Ok(mmrpresult);
case "SUPPLIER_CON_DATE"://日物料需求计划风险确认 case "SUPPLIER_CON_DATE"://日物料需求计划风险确认
@ -205,7 +204,7 @@ namespace Wood.Service.Controllers
var con_poresult = await con_poservice.GetTaskDataPaged(requestInputBase); var con_poresult = await con_poservice.GetTaskDataPaged(requestInputBase);
return Ok(con_poresult); return Ok(con_poresult);
case "SUPPLIER_SINV_DATA":// case "SUPPLIER_SINV_DATA"://
var service1 = _builder.GetRequiredService<CherySupplierSinvDataService>(); var service1 = _builder.GetRequiredService<CherySupplierSinvDataLogService>();
var table = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); var table = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(table); requestInputBase.Condition.Filters.Remove(table);
var result1 = await service1.GetLogDataPaged(requestInputBase); var result1 = await service1.GetLogDataPaged(requestInputBase);

Write Preview
Loading…
Cancel
Save