diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_EMPLOYEE_DT_DTO.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_EMPLOYEE_DT_DTO.cs index f92f4a9..beba2d9 100644 --- a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_EMPLOYEE_DT_DTO.cs +++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_EMPLOYEE_DT_DTO.cs @@ -10,7 +10,7 @@ namespace TaskManager.Entity /// /// 人员资质信息 /// - public class SUPPLIER_EMPLOYEE_DT_DTO : BaseEntity_NoTask + public class SUPPLIER_EMPLOYEE_DT_DTO { /// /// 供应商代码 diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_INFO_DT_DTO.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_INFO_DT_DTO.cs index db4d8cd..6de67b5 100644 --- a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_INFO_DT_DTO.cs +++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_INFO_DT_DTO.cs @@ -10,7 +10,7 @@ namespace TaskManager.Entity /// /// 供应商基础信息 /// - public class SUPPLIER_INFO_DT_DTO : BaseEntity_NoTask + public class SUPPLIER_INFO_DT_DTO { /// /// 供应商代码 diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_PROCESS_EQUIPMENT_DT.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_PROCESS_EQUIPMENT_DT.cs index 3ca0595..3e0f034 100644 --- a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_PROCESS_EQUIPMENT_DT.cs +++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_PROCESS_EQUIPMENT_DT.cs @@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys /// /// 工艺装备 /// - public class SUPPLIER_PRO_PROCESS_EQUIPMENT_DT : BaseEntity_NoTask + public class SUPPLIER_PRO_PROCESS_EQUIPMENT_DT { /// /// 供应商代码 diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs index b5b3faf..82fc756 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs @@ -1,25 +1,31 @@ -using System.Data; -using System.Drawing.Printing; -using System.Linq.Expressions; -using System.Text; -using System.Text.Json; -using System.Text.Json.Serialization; -using Azure.Core; +using Azure.Core; using Dapper; using Magicodes.ExporterAndImporter.Core.Extension; using Magicodes.ExporterAndImporter.Excel; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.HttpResults; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; +using Omu.ValueInjecter; +using System.Data; +using System.Drawing.Printing; +using System.Linq.Expressions; +using System.Security.Policy; +using System.Text; +using System.Text.Json; +using System.Text.Json.Serialization; using TaskManager.Contracts.Dtos; using TaskManager.Entity; using TaskManager.EntityFramework; using TaskManager.EntityFramework.Repository; +using static Dapper.SqlMapper; namespace TaskManager.Controllers { - public class CheryRecurringJobInputPageController : RecurringJobBaseController where T : BaseEntity ,new() + public class CheryRecurringJobInputPageController : RecurringJobBaseController + where T : BaseEntity ,new() + where TDTO:class,new() { protected readonly IRepository _repository; public CheryRecurringJobInputPageController(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log) @@ -27,6 +33,32 @@ namespace TaskManager.Controllers _repository = repository; } + + + /// + /// 手工发送调用接口 + /// + /// 任务名称 + /// 请求日期 + /// 客户(Chery) + /// + [HttpGet] + public virtual async Task CustomInvokeAsync(string taskName, string client) + { + var first = _jobDbContext.TaskConifgure.FirstOrDefault(p => p.TaskName == taskName && p.Client == client); + if (first == null) + { + await _logger.AddError($"手工调用接口{taskName}任务没找到", taskName); + return; + } + Url = first.Url; + Path = first.Api; + TaskName = first.TaskName; + Client = client; + await SyncTaskSubTable(TaskName, Client); + } + + protected override async Task DoExecutingAsync(string url, string path, string takName, string client) { Url = url; @@ -36,7 +68,7 @@ namespace TaskManager.Controllers await SyncTaskSubTable(TaskName,Client); } - private async Task PostPageAsync(PagedRequest t) + private async Task PostPageAsync(PagedRequest t) { try { @@ -108,13 +140,11 @@ namespace TaskManager.Controllers private async Task SyncTaskSubTable(string taskName, string client) { - if (string.IsNullOrEmpty(taskName) || string.IsNullOrEmpty(client)) { await _logger.AddError("任务名称或客户端不能为空",taskName); return; } - var sublist = _jobDbContext.TaskSub.Where(p => p.TaskName == taskName && p.WriteState == false && p.Subscriber == client).ToList(); int pageSize = 1000; if (!sublist.Any()) @@ -129,20 +159,28 @@ namespace TaskManager.Controllers var total = entites.Count(); int totalPages = (int)Math.Ceiling((double)total / pageSize); - for (int i = 1; i <= totalPages; i++) + for (int i = sub.SyncedPageCount; i <= totalPages; i++) { var records = entites.Skip((i - 1) * pageSize) .Take(pageSize).ToList(); - - PagedRequest pagedRequest = new PagedRequest() + #region dto转换作为参数发给 + List dtos = new List(); + foreach (var itm in records) + { + TDTO dto = new TDTO(); + dto.InjectFrom(itm); + dtos.Add(dto); + } + PagedRequest pagedRequest = new PagedRequest() { batchNo = GenerateRandomStringWith8EG(), total = entites.Count(), pageSize = pageSize, - list = records, + list = dtos, pageNum = i }; + #endregion foreach (var itm in records) { itm.WriteState = true; @@ -237,7 +275,7 @@ namespace TaskManager.Controllers Expression> filter = null; var pagedResult = await _repository.GetPagedAsync(filter, pagingParams); - return new JsonResult(pagedResult); + return Ok(pagedResult); } [HttpGet] diff --git a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs index fff9825..024e669 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs @@ -7,6 +7,7 @@ using Magicodes.ExporterAndImporter.Excel; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.HttpResults; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.EntityFrameworkCore; @@ -302,11 +303,26 @@ namespace TaskManager.Controllers } } - [NonAction] - public virtual async Task TestAsync(string url, string path, string taskName, string inputdate) + /// + /// 手工获取调用接口 + /// + /// 任务名称 + /// 请求日期 + /// 客户(Chery) + /// + [HttpGet] + public virtual async Task CustomInvokeAsync(string taskName, string inputdate,string client) { - Url = url; - Path = path; + var first= _jobDbContext.TaskConifgure.FirstOrDefault(p => p.TaskName == taskName && p.Client == client); + if (first == null) + { + await _logger.AddError($"手工调用接口{taskName}没找到", taskName); + + return; + } + + Url =first.Url; + Path = first.Api; TaskName = taskName; await FetchAllDataAsync(inputdate); } @@ -408,7 +424,7 @@ namespace TaskManager.Controllers Expression> filter = null; var pagedResult = await _repository.GetPagedAsync(filter, pagingParams); - return new JsonResult(pagedResult); + return Ok(pagedResult); } /// diff --git a/API/Wood.Service/Controllers/NormalBaseController.cs b/API/Wood.Service/Controllers/NormalBaseController.cs index 7d7ee6d..555316a 100644 --- a/API/Wood.Service/Controllers/NormalBaseController.cs +++ b/API/Wood.Service/Controllers/NormalBaseController.cs @@ -130,7 +130,7 @@ namespace Wood.Service.Controllers Expression> filter = null; var pagedResult = await _repository.GetPagedAsync(filter, pagingParams); - return new JsonResult(pagedResult); + return Ok(pagedResult); } /// diff --git a/API/Wood.Service/Controllers/TaskConifgureController.cs b/API/Wood.Service/Controllers/TaskConifgureController.cs index eccf650..fdafc5d 100644 --- a/API/Wood.Service/Controllers/TaskConifgureController.cs +++ b/API/Wood.Service/Controllers/TaskConifgureController.cs @@ -71,164 +71,164 @@ namespace TaskManager.Controllers - /// - /// 执行铁定任务 - /// - /// - /// - [NonAction] - public async Task testTask(string taskName) - { - var first = await _context.TaskConifgure.FirstOrDefaultAsync(p => p.TaskName == taskName); - var url = first.Url; - var path = first.Api; - var controller = _builder.GetRequiredService(); - await controller.TestAsync(url, path, taskName, "2025-04-21"); - - } - [NonAction] - public async Task TaskAllAsync(string date) - { - var tasks = _context.TaskConifgure.Where(p => p.IsAuto == true && !string.IsNullOrEmpty(p.Corn) - && !string.IsNullOrEmpty(p.Api) && !string.IsNullOrEmpty(p.Url)).ToList(); - - - foreach (var task in tasks) - { - try - { - var url = task.Url; - var path = task.Api; - var taskname = task.TaskName; - - switch (task.TaskName) - { - //case "整车月度生产计划1": + ///// + ///// 执行铁定任务 + ///// + ///// + ///// + //[NonAction] + //public async Task testTask(string taskName) + //{ + // var first = await _context.TaskConifgure.FirstOrDefaultAsync(p => p.TaskName == taskName); + // var url = first.Url; + // var path = first.Api; + // var controller = _builder.GetRequiredService(); + // await controller.TestAsync(url, path, taskName, "2025-04-21"); + + //} + //[NonAction] + //public async Task TaskAllAsync(string date) + //{ + // var tasks = _context.TaskConifgure.Where(p => p.IsAuto == true && !string.IsNullOrEmpty(p.Corn) + // && !string.IsNullOrEmpty(p.Api) && !string.IsNullOrEmpty(p.Url)).ToList(); + + + // foreach (var task in tasks) + // { + // try + // { + // var url = task.Url; + // var path = task.Api; + // var taskname = task.TaskName; + + // switch (task.TaskName) + // { + // //case "整车月度生产计划1": - // // 添加的代码块 - // var controller1 = _builder.GetRequiredService(); - // await controller1.TestAsync(url, path, taskname, "2025-05-29"); - // break; + // // // 添加的代码块 + // // var controller1 = _builder.GetRequiredService(); + // // await controller1.TestAsync(url, path, taskname, "2025-05-29"); + // // break; - case "M+6月物料需求计划1": + // case "M+6月物料需求计划1": - // 添加的代码块 - var controller2 = _builder.GetRequiredService(); - await controller2.TestAsync(url, path, taskname, "2025-05-29"); - break; + // // 添加的代码块 + // var controller2 = _builder.GetRequiredService(); + // await controller2.TestAsync(url, path, taskname, "2025-05-29"); + // break; - case "整车月度生产计划2": + // case "整车月度生产计划2": - // 添加的代码块 - var controller3 = _builder.GetRequiredService(); - await controller3.TestAsync(url, path, taskname, "2025-05-29"); - break; + // // 添加的代码块 + // var controller3 = _builder.GetRequiredService(); + // await controller3.TestAsync(url, path, taskname, "2025-05-29"); + // break; - case "M+6月物料需求计划2": + // case "M+6月物料需求计划2": - // 添加的代码块 - var controller4 = _builder.GetRequiredService(); - await controller4.TestAsync(url, path, taskname, "2025-05-29"); - break; + // // 添加的代码块 + // var controller4 = _builder.GetRequiredService(); + // await controller4.TestAsync(url, path, taskname, "2025-05-29"); + // break; - case "日物料需求计划": + // case "日物料需求计划": - // 添加的代码块 - var controller5 = _builder.GetRequiredService(); - await controller5.TestAsync(url, path, taskname, "2025-05-29"); - break; + // // 添加的代码块 + // var controller5 = _builder.GetRequiredService(); + // await controller5.TestAsync(url, path, taskname, "2025-05-29"); + // break; - case "计划协议": + // case "计划协议": - // 添加的代码块 - var controller6 = _builder.GetRequiredService(); - await controller6.TestAsync(url, path, taskname, "2025-05-29"); - break; + // // 添加的代码块 + // var controller6 = _builder.GetRequiredService(); + // await controller6.TestAsync(url, path, taskname, "2025-05-29"); + // break; - case "采购订单": + // case "采购订单": - // 添加的代码块 - var controller7 = _builder.GetRequiredService(); - await controller7.TestAsync(url, path, taskname, "2025-05-29"); - break; + // // 添加的代码块 + // var controller7 = _builder.GetRequiredService(); + // await controller7.TestAsync(url, path, taskname, "2025-05-29"); + // break; - case "过焊装未过总装": + // case "过焊装未过总装": - // 添加的代码块 - var controller8 = _builder.GetRequiredService(); - await controller8.TestAsync(url, path, taskname, "2025-05-29"); - break; + // // 添加的代码块 + // var controller8 = _builder.GetRequiredService(); + // await controller8.TestAsync(url, path, taskname, "2025-05-29"); + // break; - case "过涂装未过总装": + // case "过涂装未过总装": - // 添加的代码块 - var controller9 = _builder.GetRequiredService(); - await controller9.TestAsync(url, path, taskname, "2025-05-29"); - break; + // // 添加的代码块 + // var controller9 = _builder.GetRequiredService(); + // await controller9.TestAsync(url, path, taskname, "2025-05-29"); + // break; - case "排序供货": + // case "排序供货": - // 添加的代码块 - var controller10 = _builder.GetRequiredService(); - await controller10.TestAsync(url, path, taskname, "2025-05-29"); - break; + // // 添加的代码块 + // var controller10 = _builder.GetRequiredService(); + // await controller10.TestAsync(url, path, taskname, "2025-05-29"); + // break; - case "看板配送单": + // case "看板配送单": - // 添加的代码块 - var controller11 = _builder.GetRequiredService(); - await controller11.TestAsync(url, path, taskname, "2025-05-29"); - break; + // // 添加的代码块 + // var controller11 = _builder.GetRequiredService(); + // await controller11.TestAsync(url, path, taskname, "2025-05-29"); + // break; - case "退货单": + // case "退货单": - // 添加的代码块 - var controller12 = _builder.GetRequiredService(); - await controller12.TestAsync(url, path, taskname, "2025-05-29"); - break; + // // 添加的代码块 + // var controller12 = _builder.GetRequiredService(); + // await controller12.TestAsync(url, path, taskname, "2025-05-29"); + // break; - case "奇瑞RDC共享库存": + // case "奇瑞RDC共享库存": - // 添加的代码块 - var controller13 = _builder.GetRequiredService(); - await controller13.TestAsync(url, path, taskname, "2025-05-29"); - break; + // // 添加的代码块 + // var controller13 = _builder.GetRequiredService(); + // await controller13.TestAsync(url, path, taskname, "2025-05-29"); + // break; - case "日MRP状态监控": + // case "日MRP状态监控": - // 添加的代码块 - var controller14 = _builder.GetRequiredService(); - await controller14.TestAsync(url, path, taskname, "2025-05-29"); - break; + // // 添加的代码块 + // var controller14 = _builder.GetRequiredService(); + // await controller14.TestAsync(url, path, taskname, "2025-05-29"); + // break; - case "日MRP预警推移": + // case "日MRP预警推移": - // 添加的代码块 - var controller15 = _builder.GetRequiredService(); - await controller15.TestAsync(url, path, taskname, "2025-05-29"); - break; - case "供应商共享库存-上午": + // // 添加的代码块 + // var controller15 = _builder.GetRequiredService(); + // await controller15.TestAsync(url, path, taskname, "2025-05-29"); + // break; + // case "供应商共享库存-上午": - // 添加的代码块 - var controller19 = _builder.GetRequiredService(); - await controller19.TestAsync(url, path, taskname, "2025-05-29"); - break; + // // 添加的代码块 + // var controller19 = _builder.GetRequiredService(); + // await controller19.TestAsync(url, path, taskname, "2025-05-29"); + // break; - case "供应商共享库存-晚上": + // case "供应商共享库存-晚上": - // 添加的代码块 - var controller20 = _builder.GetRequiredService(); - await controller20.TestAsync(url, path, taskname, "2025-05-29"); - break; - } + // // 添加的代码块 + // var controller20 = _builder.GetRequiredService(); + // await controller20.TestAsync(url, path, taskname, "2025-05-29"); + // break; + // } - } - catch - { + // } + // catch + // { - } + // } @@ -241,8 +241,8 @@ namespace TaskManager.Controllers - } - } + // } + //}