From 41caa71d3bffdc0d8e29134abf466defe9a8da3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Thu, 19 Jun 2025 16:44:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CheryRecurringJobInputPageController.cs | 21 ++ ...ryRecurringJobInputPageExtendController.cs | 20 ++ .../CheryRecurringJobOutPageController.cs | 4 +- .../CherySupplierConDateService.cs | 1 + .../Controllers/CustomLogService.cs | 267 ++++++++++-------- .../LogServices/CherySupplierSaWeekService.cs | 19 ++ .../CherySupplierSinvDataService.cs | 17 ++ .../Controllers/NormalBaseController.cs | 23 ++ .../Controllers/RecurringJobBaseController.cs | 6 +- .../Controllers/TaskConifgureController.cs | 2 +- 10 files changed, 253 insertions(+), 127 deletions(-) create mode 100644 API/Wood.Service/Controllers/LogServices/CherySupplierSaWeekService.cs create mode 100644 API/Wood.Service/Controllers/LogServices/CherySupplierSinvDataService.cs diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs index ffcefbf..a3c91dc 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs @@ -81,7 +81,28 @@ namespace TaskManager.Controllers //await SyncTaskSubTable(TaskName, Client); } + [HttpPost] + public async Task> GetLogDataPaged(RequestInputBase input) + { + var pagingParams = new PagingParams + { + PageNumber = input.pageNumber, + PageSize = input.pageSize, + SortBy = input.sortBy, + IsAscending = input.isAscending, + }; + + //var json = JsonSerializer.Serialize(input); + + + + // 可以在这里构建表达式树过滤条件 + Expression> filter = null; + + var pagedResult = await _repository.GetDataPagedAsync(filter, pagingParams, input.Condition); + return pagedResult; + } protected override async Task DoExecutingAsync(string url, string path, string takName, string client, int pagesize) { diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs index e65ddf7..f3a4581 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs @@ -88,8 +88,28 @@ namespace TaskManager.Controllers public async Task SyncTaskSubTable() { } + [HttpPost] + public async Task> GetLogDataPaged(RequestInputBase input) + { + var pagingParams = new PagingParams + { + PageNumber = input.pageNumber, + PageSize = input.pageSize, + SortBy = input.sortBy, + IsAscending = input.isAscending, + }; + //var json = JsonSerializer.Serialize(input); + + + + // 可以在这里构建表达式树过滤条件 + Expression> filter = null; + + var pagedResult = await _repository.GetDataPagedAsync(filter, pagingParams, input.Condition); + return pagedResult; + } diff --git a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs index 3633000..3dccfd7 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs @@ -491,7 +491,7 @@ namespace TaskManager.Controllers return Ok(pagedResult); } - + [HttpPost] public async Task> GetLogDataPaged(RequestInputBase input) { @@ -504,7 +504,7 @@ namespace TaskManager.Controllers }; - var json = JsonSerializer.Serialize(input); + //var json = JsonSerializer.Serialize(input); diff --git a/API/Wood.Service/Controllers/CherySupplierConDateService.cs b/API/Wood.Service/Controllers/CherySupplierConDateService.cs index 41dbe65..e4e0338 100644 --- a/API/Wood.Service/Controllers/CherySupplierConDateService.cs +++ b/API/Wood.Service/Controllers/CherySupplierConDateService.cs @@ -68,6 +68,7 @@ namespace TaskManager.Controllers task.CreateUser = "admin"; task.CreationTime = DateTime.Now; task.SyncedPageCount = 0; + task.ReadState = true; entites.ForEach(p => { p.ReadState = true; diff --git a/API/Wood.Service/Controllers/CustomLogService.cs b/API/Wood.Service/Controllers/CustomLogService.cs index 0a84d1c..8eb2fb2 100644 --- a/API/Wood.Service/Controllers/CustomLogService.cs +++ b/API/Wood.Service/Controllers/CustomLogService.cs @@ -2,9 +2,12 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using OfficeOpenXml.FormulaParsing.Excel.Functions.Numeric; using System; using System.Collections.Generic; +using System.Drawing.Printing; using System.Linq; +using System.Security.Policy; using System.Text; using System.Threading.Tasks; using TaskManager.Controllers; @@ -45,7 +48,7 @@ namespace Wood.Service.Controllers } return new JsonResult(new { Code = 400, Message = "没找到文件!" }); } - [HttpGet] + [HttpPost] public async Task GetLogReponseList([FromBody] RequestInputBase requestInputBase) { var uid = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "Uid").Value; @@ -53,178 +56,198 @@ namespace Wood.Service.Controllers var first = _context.TaskLogs.FirstOrDefault(x => x.UId == long.Parse(uid)); + switch (first.TaskName) { - //case "来料检验数据": - // var stockservice = _builder.GetRequiredService(); - - // requestInputBase.Condition.Filters.Add(new Filter()); - // var stockresult = await stockservice.GetTaskDataPaged(requestInputBase); - - - - // - // break; - //case "排产数据": - // - - // break; - //case "供应商基础信息": - // - - // break; - //case "人员资质信息": - // - - // break; - //case "BOM主数据": - // - - // break; - //case "过程控制项质量数据": - // - - // break; - //case "生产过程数据": - // - - // break; - //case "产品一次合格率": - // - - // break; - //case "工位一次合格率": - // - - // break; - //case "缺陷业务数据": - // - - // break; - //case "环境业务数据": - // - - // break; - //case "设备OEE达成率": - // - - // break; - //case "OEE时间明细": - // - - // break; - //case "物料主数据": - // - - // break; - //case "工艺装备": - // - - // break; - //case "工艺": - // - - //break; - //case "M+6月物料需求计划风险确认": - - - // break; - //case "日物料需求计划风险确认": - - - // break; - //case "采购订单风险确认": - - - // break; - //case "供应商共享库存-上午": - - - // break; - //case "供应商共享库存-晚上": - - // break; - - + case "来料检验数据": + var stockService = _builder.GetRequiredService(); + requestInputBase.Condition.Filters.Add(new Filter()); + var stockResult = await stockService.GetTaskDataPaged(requestInputBase); + return Ok(stockResult); + + case "排产数据": + var schedulingService = _builder.GetRequiredService(); + var schedulingResult = await schedulingService.GetLogDataPaged(requestInputBase); + return Ok(schedulingResult); + + case "供应商基础信息": + var supplierInfoService = _builder.GetRequiredService(); + var supplierInfoResult = await supplierInfoService.GetLogDataPaged(requestInputBase); + return Ok(supplierInfoResult); + + case "人员资质信息": + var employeeService = _builder.GetRequiredService(); + var employeeResult = await employeeService.GetLogDataPaged(requestInputBase); + return Ok(employeeResult); + + case "BOM主数据": + var bomService = _builder.GetRequiredService(); + var bomResult = await bomService.GetLogDataPaged(requestInputBase); + return Ok(bomResult); + + case "过程控制项质量数据": + var cpsService = _builder.GetRequiredService(); + var cpsResult = await cpsService.GetLogDataPaged(requestInputBase); + return Ok(cpsResult); + + case "生产过程数据": + var proDataService = _builder.GetRequiredService(); + var proDataResult = await proDataService.GetLogDataPaged(requestInputBase); + return Ok(proDataResult); + + case "产品一次合格率": + var firstPassYieldService = _builder.GetRequiredService(); + var firstPassYieldResult = await firstPassYieldService.GetLogDataPaged(requestInputBase); + return Ok(firstPassYieldResult); + + case "工位一次合格率": + var stationFirstPassYieldService = _builder.GetRequiredService(); + var stationFirstPassYieldResult = await stationFirstPassYieldService.GetLogDataPaged(requestInputBase); + return Ok(stationFirstPassYieldResult); + + case "缺陷业务数据": + var flawService = _builder.GetRequiredService(); + var flawResult = await flawService.GetLogDataPaged(requestInputBase); + return Ok(flawResult); + + case "环境业务数据": + var environmentService = _builder.GetRequiredService(); + var environmentResult = await environmentService.GetLogDataPaged(requestInputBase); + return Ok(environmentResult); + + case "设备OEE达成率": + var oeeAchievementRateService = _builder.GetRequiredService(); + var oeeAchievementRateResult = await oeeAchievementRateService.GetLogDataPaged(requestInputBase); + return Ok(oeeAchievementRateResult); + + case "OEE时间明细": + var oeeTimeDetailsService = _builder.GetRequiredService(); + var oeeTimeDetailsResult = await oeeTimeDetailsService.GetLogDataPaged(requestInputBase); + return Ok(oeeTimeDetailsResult); + + case "物料主数据": + var materialDataService = _builder.GetRequiredService(); + var materialDataResult = await materialDataService.GetLogDataPaged(requestInputBase); + return Ok(materialDataResult); + + case "附件类数据": + var attachmentDataService = _builder.GetRequiredService(); + var attachmentDataResult = await attachmentDataService.GetLogDataPaged(requestInputBase); + return Ok(attachmentDataResult); + + case "工艺装备": + var processEquipmentService = _builder.GetRequiredService(); + var processEquipmentResult = await processEquipmentService.GetLogDataPaged(requestInputBase); + return Ok(processEquipmentResult); + + case "工艺": + var processService = _builder.GetRequiredService(); + var processResult = await processService.GetLogDataPaged(requestInputBase); + return Ok(processResult); + + case "M+6月物料需求计划风险确认": + var m6RiskService = _builder.GetRequiredService(); // 假设此业务仍使用排产服务 + var m6RiskResult = await m6RiskService.GetLogDataPaged(requestInputBase); + return Ok(m6RiskResult); + + case "日物料需求计划风险确认": + var dailyRiskService = _builder.GetRequiredService(); // 假设此业务仍使用排产服务 + var dailyRiskResult = await dailyRiskService.GetLogDataPaged(requestInputBase); + return Ok(dailyRiskResult); + + case "采购订单风险确认": + var purchaseOrderRiskService = _builder.GetRequiredService(); // 假设此业务仍使用排产服务 + var purchaseOrderRiskResult = await purchaseOrderRiskService.GetLogDataPaged(requestInputBase); + return Ok(purchaseOrderRiskResult); + + case "供应商共享库存-上午": + var morningStockService = _builder.GetRequiredService(); // 假设此业务仍使用排产服务 + var morningStockResult = await morningStockService.GetLogDataPaged(requestInputBase); + return Ok(morningStockResult); + + case "供应商共享库存-晚上": + var eveningStockService = _builder.GetRequiredService(); // 假设此业务仍使用排产服务 + var eveningStockResult = await eveningStockService.GetLogDataPaged(requestInputBase); + return Ok(eveningStockResult); case "整车月度生产计划1": - var service1 = _builder.GetRequiredService(); + var service1 = _builder.GetRequiredService(); var result1 = await service1.GetLogDataPaged(requestInputBase); return Ok(result1); - break; + case "M+6月物料需求计划1": - var service2 = _builder.GetRequiredService(); + var service2 = _builder.GetRequiredService(); var result2 = await service2.GetLogDataPaged(requestInputBase); return Ok(result2); - break; + case "整车月度生产计划2": - var service3 = _builder.GetRequiredService(); + var service3 = _builder.GetRequiredService(); var result3= await service3.GetLogDataPaged(requestInputBase); return Ok(result3); - break; + case "M+6月物料需求计划2": - var service4 = _builder.GetRequiredService(); + var service4 = _builder.GetRequiredService(); var result4= await service4.GetLogDataPaged(requestInputBase); return Ok(result4); - break; + case "日物料需求计划": - var service5 = _builder.GetRequiredService(); + var service5 = _builder.GetRequiredService(); var result5 = await service5.GetLogDataPaged(requestInputBase); return Ok(result5); - break; + case "计划协议": - var service6 = _builder.GetRequiredService(); + var service6 = _builder.GetRequiredService(); var result6 = await service6.GetLogDataPaged(requestInputBase); return Ok(result6); - break; + case "采购订单": - var service7 = _builder.GetRequiredService(); + var service7 = _builder.GetRequiredService(); var result7 = await service7.GetLogDataPaged(requestInputBase); return Ok(result7); - break; + case "过焊装未过总装": - var service8 = _builder.GetRequiredService(); + var service8 = _builder.GetRequiredService(); var result8 = await service8.GetLogDataPaged(requestInputBase); return Ok(result8); - break; + case "过涂装未过总装": - var service9 = _builder.GetRequiredService(); + var service9 = _builder.GetRequiredService(); var result9 = await service9.GetLogDataPaged(requestInputBase); return Ok(result9); - break; + case "排序供货": - var service10 = _builder.GetRequiredService(); + var service10 = _builder.GetRequiredService(); var result10 = await service10.GetLogDataPaged(requestInputBase); return Ok(result10); - break; + case "看板配送单": - var service11 = _builder.GetRequiredService(); + var service11 = _builder.GetRequiredService(); var result11 = await service11.GetLogDataPaged(requestInputBase); return Ok(result11); - break; + case "退货单": - var service12 = _builder.GetRequiredService(); + var service12 = _builder.GetRequiredService(); var result12 = await service12.GetLogDataPaged(requestInputBase); return Ok(result12); - break; + case "奇瑞RDC共享库存": - var service13 = _builder.GetRequiredService(); + var service13 = _builder.GetRequiredService(); var result13 = await service13.GetLogDataPaged(requestInputBase); return Ok(result13); - break; + case "日MRP状态监控": - var service14 = _builder.GetRequiredService(); + var service14 = _builder.GetRequiredService(); var result14 = await service14.GetLogDataPaged(requestInputBase); return Ok(result14); - break; + case "日MRP预警推移": - var service15 = _builder.GetRequiredService(); + var service15 = _builder.GetRequiredService(); var result15 = await service15.GetLogDataPaged(requestInputBase); return Ok(result15); - break; + } diff --git a/API/Wood.Service/Controllers/LogServices/CherySupplierSaWeekService.cs b/API/Wood.Service/Controllers/LogServices/CherySupplierSaWeekService.cs new file mode 100644 index 0000000..08efc1a --- /dev/null +++ b/API/Wood.Service/Controllers/LogServices/CherySupplierSaWeekService.cs @@ -0,0 +1,19 @@ +using Microsoft.Extensions.Configuration; +using TaskManager.Contracts.Dtos; +using TaskManager.Controllers; +using TaskManager.Entity; +using TaskManager.EntityFramework; +using Wood.Service.Controllers; + +namespace TaskManager.Controllers +{ + /// + /// 计划协议 + /// + public class CherySupplierSaWeekLogService : NormalBaseController + { + public CherySupplierSaWeekLogService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository repository) : base(context, builder, configuration, repository) + { + } + } +} diff --git a/API/Wood.Service/Controllers/LogServices/CherySupplierSinvDataService.cs b/API/Wood.Service/Controllers/LogServices/CherySupplierSinvDataService.cs new file mode 100644 index 0000000..6babd99 --- /dev/null +++ b/API/Wood.Service/Controllers/LogServices/CherySupplierSinvDataService.cs @@ -0,0 +1,17 @@ +using Microsoft.Extensions.Configuration; +using TaskManager.Contracts.Dtos; +using TaskManager.Controllers; +using TaskManager.Entity; +using TaskManager.Entity.Entitys; +using TaskManager.EntityFramework; +using Wood.Service.Controllers; + +namespace TaskManager.Controllers +{ + public class CherySupplierSinvDataLogService : NormalBaseController + { + public CherySupplierSinvDataLogService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository repository) : base(context, builder, configuration, repository) + { + } + } +} diff --git a/API/Wood.Service/Controllers/NormalBaseController.cs b/API/Wood.Service/Controllers/NormalBaseController.cs index a416892..a4e1295 100644 --- a/API/Wood.Service/Controllers/NormalBaseController.cs +++ b/API/Wood.Service/Controllers/NormalBaseController.cs @@ -350,6 +350,29 @@ namespace Wood.Service.Controllers { } + [HttpPost] + public async Task> GetLogDataPaged(RequestInputBase input) + { + var pagingParams = new PagingParams + { + PageNumber = input.pageNumber, + PageSize = input.pageSize, + SortBy = input.sortBy, + IsAscending = input.isAscending, + }; + + + //var json = JsonSerializer.Serialize(input); + + + + // 可以在这里构建表达式树过滤条件 + Expression> filter = null; + + var pagedResult = await _repository.GetDataPagedAsync(filter, pagingParams, input.Condition); + return pagedResult; + } + /// /// 高级查询字段 diff --git a/API/Wood.Service/Controllers/RecurringJobBaseController.cs b/API/Wood.Service/Controllers/RecurringJobBaseController.cs index 082ba29..4003155 100644 --- a/API/Wood.Service/Controllers/RecurringJobBaseController.cs +++ b/API/Wood.Service/Controllers/RecurringJobBaseController.cs @@ -101,14 +101,16 @@ namespace TaskManager.Controllers return string.Empty; } + ////string jsonContent = System.IO.File.ReadAllText("日物料需求计划.json"); + //string jsonContent = System.IO.File.ReadAllText("M+6月物料需求计划1.json"); ////string jsonContent = System.IO.File.ReadAllText("采购订单.json"); ////// string jsonContent = System.IO.File.ReadAllText("过焊装未过总装.json"); ////// string jsonContent = System.IO.File.ReadAllText("计划协议.json"); //////string jsonContent = System.IO.File.ReadAllText("奇瑞RDC共享库存.json"); //////string jsonContent4 = System.IO.File.ReadAllText("日MRP状态监控.json"); - ////string jsonContent = System.IO.File.ReadAllText("日物料需求计划.json"); + //////string jsonContent = System.IO.File.ReadAllText("整车月度生产计划1.json"); - //string jsonContent = System.IO.File.ReadAllText("M+6月物料需求计划1.json"); + ////string jsonContent = System.IO.File.ReadAllText("过涂装未过总装.json"); // return jsonContent; diff --git a/API/Wood.Service/Controllers/TaskConifgureController.cs b/API/Wood.Service/Controllers/TaskConifgureController.cs index 33371ab..7c1aa47 100644 --- a/API/Wood.Service/Controllers/TaskConifgureController.cs +++ b/API/Wood.Service/Controllers/TaskConifgureController.cs @@ -173,7 +173,7 @@ namespace TaskManager.Controllers switch (task.TaskName) { case "来料检验数据": - RecurringJob.AddOrUpdate( + RecurringJob.AddOrUpdate( task.TaskName, x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName, client,pagesize), task.Corn,