From 0c130995f0c387e4dd5f27a96840e68d87e03c61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 24 Jun 2025 16:50:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E5=92=8C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AF=BB=E5=8F=96=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CheryRecurringJobInputPageController.cs | 13 +++-- .../Controllers/TaskSubService.cs | 53 +++++++++---------- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs index 87a4ca1..2e78741 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs @@ -23,6 +23,7 @@ using System.Security.Policy; using System.Text; using System.Text.Json; using System.Text.Json.Serialization; +using System.Threading.Tasks; using TaskManager.Contracts.Dtos; using TaskManager.Entity; using TaskManager.EntityFramework; @@ -223,6 +224,7 @@ namespace TaskManager.Controllers var entites = _jobDbContext.Database.GetDbConnection().Query(querystr);//明细表 if (entites.Any()) { + var total = entites.Count(); sub.DataCount = total; int totalPages = (int)Math.Ceiling((double)total / pageSize); @@ -265,8 +267,13 @@ namespace TaskManager.Controllers List logs = new List(); foreach (var itm in records) { - TLOGS entity = new TLOGS(); - logs.Add(entity); + TLOGS log = new TLOGS(); + 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); sub.SyncedPageCount = i; @@ -323,7 +330,7 @@ namespace TaskManager.Controllers if (errorNumber> 0) { 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.WriteState = true; _jobDbContext.Set().Update(sub); diff --git a/API/Wood.Service/Controllers/TaskSubService.cs b/API/Wood.Service/Controllers/TaskSubService.cs index a21f48a..9a911ab 100644 --- a/API/Wood.Service/Controllers/TaskSubService.cs +++ b/API/Wood.Service/Controllers/TaskSubService.cs @@ -67,37 +67,36 @@ namespace Wood.Service.Controllers return Ok(stockresult); case "SUPPLIER_PRO_SCHEDULING"://排产数据 - var schedservice = _builder.GetRequiredService(); + var schedservice = _builder.GetRequiredService(); var schedtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(schedtask); - var schedresult = await schedservice.GetTaskDataPaged(requestInputBase); + var schedresult = await schedservice.GetLogDataPaged(requestInputBase); return Ok(schedresult); case "SUPPLIER_INFO"://供应商基础信息 - var infoservice = _builder.GetRequiredService(); + var infoservice = _builder.GetRequiredService(); var infotask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(infotask); - var inforesult = await infoservice.GetTaskDataPaged(requestInputBase); + var inforesult = await infoservice.GetLogDataPaged(requestInputBase); return Ok(inforesult); case "SUPPLIER_EMPLOYEE"://人员资质信息 - var emplyeeservice = _builder.GetRequiredService(); + var emplyeeservice = _builder.GetRequiredService(); var emplyeetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(emplyeetask); - var emplyeeresult = await emplyeeservice.GetTaskDataPaged(requestInputBase); + var emplyeeresult = await emplyeeservice.GetLogDataPaged(requestInputBase); return Ok(emplyeeresult); case "SUPPLIER_BOM"://BOM主数据 - var bomservice = _builder.GetRequiredService(); + var bomservice = _builder.GetRequiredService(); var bomtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(bomtask); - var bomresult = await bomservice.GetTaskDataPaged(requestInputBase); + var bomresult = await bomservice.GetLogDataPaged(requestInputBase); return Ok(bomresult); - case "SUPPLIER_PRO_CPS"://过程控制项质量数据 var cpsservice = _builder.GetRequiredService(); var cpstask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); @@ -129,66 +128,66 @@ namespace Wood.Service.Controllers return Ok(pasyresult); case "SUPPLIER_PRO_FLAW"://缺陷业务数据 - var flawservice = _builder.GetRequiredService(); + var flawservice = _builder.GetRequiredService(); var flawtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(flawtask); var flawresult = await flawservice.GetLogDataPaged(requestInputBase); return Ok(flawresult); case "SUPPLIER_PRO_ENVIRONMENT"://环境业务数据 - var envservice = _builder.GetRequiredService(); + var envservice = _builder.GetRequiredService(); var envtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(envtask); - var envresult = await envservice.GetTaskDataPaged(requestInputBase); + var envresult = await envservice.GetLogDataPaged(requestInputBase); return Ok(envresult); case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE"://设备OEE达成率 - var rateservice = _builder.GetRequiredService(); + var rateservice = _builder.GetRequiredService(); var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(ratetask); - var rateresult = await rateservice.GetTaskDataPaged(requestInputBase); + var rateresult = await rateservice.GetLogDataPaged(requestInputBase); return Ok(rateresult); case "SUPPLIER_PRO_OEE_TIME_DETAILS"://OEE时间明细 - var detailservice = _builder.GetRequiredService(); + var detailservice = _builder.GetRequiredService(); var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(detailtask); - var detailresult = await detailservice.GetTaskDataPaged(requestInputBase); + var detailresult = await detailservice.GetLogDataPaged(requestInputBase); return Ok(detailresult); case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据 - var materialservice = _builder.GetRequiredService(); + var materialservice = _builder.GetRequiredService(); var materialtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(materialtask); - var materialresult = await materialservice.GetTaskDataPaged(requestInputBase); + var materialresult = await materialservice.GetLogDataPaged(requestInputBase); return Ok(materialresult); case "SUPPLIER_PRO_ATTACHMENT_DATA":// 附件类数据 - var attachment_dataservice = _builder.GetRequiredService(); + var attachment_dataservice = _builder.GetRequiredService(); var attachment_datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); 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); case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备 - var eqservice = _builder.GetRequiredService(); + var eqservice = _builder.GetRequiredService(); var eqtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(eqtask); - var eqresult = await eqservice.GetTaskDataPaged(requestInputBase); + var eqresult = await eqservice.GetLogDataPaged(requestInputBase); return Ok(eqresult); case "SUPPLIER_PRO_PROCESS"://工艺 - var processservice = _builder.GetRequiredService(); + var processservice = _builder.GetRequiredService(); var processtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(processtask); - var processresult = await processservice.GetTaskDataPaged(requestInputBase); + var processresult = await processservice.GetLogDataPaged(requestInputBase); return Ok(processresult); case "SUPPLIER_CON_MMRP"://M+6月物料需求计划风险确认 - var mmrpservice = _builder.GetRequiredService(); + var mmrpservice = _builder.GetRequiredService(); var mmrptask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(mmrptask); - var mmrpresult = await mmrpservice.GetTaskDataPaged(requestInputBase); + var mmrpresult = await mmrpservice.GetLogDataPaged(requestInputBase); return Ok(mmrpresult); case "SUPPLIER_CON_DATE"://日物料需求计划风险确认 @@ -205,7 +204,7 @@ namespace Wood.Service.Controllers var con_poresult = await con_poservice.GetTaskDataPaged(requestInputBase); return Ok(con_poresult); case "SUPPLIER_SINV_DATA":// - var service1 = _builder.GetRequiredService(); + var service1 = _builder.GetRequiredService(); var table = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(table); var result1 = await service1.GetLogDataPaged(requestInputBase);