From db154b56c1e534e4ce345dec66e98133a380af83 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Fri, 6 Jun 2025 13:14:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CheryRecurringJobInputPageController.cs | 22 +++++++ .../Controllers/TaskSubService.cs | 64 +++++++++---------- 2 files changed, 54 insertions(+), 32 deletions(-) diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs index b163409..252c614 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs @@ -311,6 +311,28 @@ namespace TaskManager.Controllers return Ok(pagedResult); } + public async Task> GetTaskDataPaged(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; + } + /// /// 导出New /// diff --git a/API/Wood.Service/Controllers/TaskSubService.cs b/API/Wood.Service/Controllers/TaskSubService.cs index ae13e7c..ef788d8 100644 --- a/API/Wood.Service/Controllers/TaskSubService.cs +++ b/API/Wood.Service/Controllers/TaskSubService.cs @@ -58,30 +58,30 @@ namespace Wood.Service.Controllers var stockservice = _builder.GetRequiredService(); var stocktask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(stocktask); - var stockresult = await stockservice.GetDataPaged(requestInputBase); - return Ok(stockresult.Value); + var stockresult = await stockservice.GetTaskDataPaged(requestInputBase); + return Ok(stockresult); case "SUPPLIER_PRO_SCHEDULING": 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); + var schedresult = await schedservice.GetTaskDataPaged(requestInputBase); + return Ok(schedresult); case "SUPPLIER_INFO": 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); + var inforesult = await infoservice.GetTaskDataPaged(requestInputBase); + return Ok(inforesult); case "SUPPLIER_EMPLOYEE"://人员资质信息 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); + var emplyeeresult = await emplyeeservice.GetTaskDataPaged(requestInputBase); + return Ok(emplyeeresult); case "SUPPLIER_BOM"://BOM主数据 @@ -89,88 +89,88 @@ namespace Wood.Service.Controllers var bomservice = _builder.GetRequiredService(); var bomtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(bomtask); - var bomresult = await bomservice.GetDataPaged(requestInputBase); - return Ok(bomresult.Value); + var bomresult = await bomservice.GetTaskDataPaged(requestInputBase); + return Ok(bomresult); case "SUPPLIER_PRO_CPS"://过程控制项质量数据 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); + var cpsresult = await cpsservice.GetTaskDataPaged(requestInputBase); + return Ok(cpsresult); case "SUPPLIER_PRO_DATA": 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); + var dataresult = await dataservice.GetTaskDataPaged(requestInputBase); + return Ok(dataresult); case "SUPPLIER_PRO_FIRST_PASSYIELD": 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); + var passyieldresult = await passyieldservice.GetTaskDataPaged(requestInputBase); + return Ok(passyieldresult); case "SUPPLIER_PRO_STATION_FIRST_PASSYIELD": 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); + var pasyresult = await pasyservice.GetTaskDataPaged(requestInputBase); + return Ok(pasyresult); case "SUPPLIER_PRO_FLAW": 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); + var flawresult = await flawservice.GetTaskDataPaged(requestInputBase); + return Ok(flawresult); case "SUPPLIER_PRO_ENVIRONMENT": var envservice = _builder.GetRequiredService(); var envtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(envtask); - var envresult = await envservice.GetDataPaged(requestInputBase); - return Ok(envresult.Value); + var envresult = await envservice.GetTaskDataPaged(requestInputBase); + return Ok(envresult); case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE": var rateservice = _builder.GetRequiredService(); var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(ratetask); - var rateresult = await rateservice.GetDataPaged(requestInputBase); - return Ok(rateresult.Value); + var rateresult = await rateservice.GetTaskDataPaged(requestInputBase); + return Ok(rateresult); case "SUPPLIER_PRO_OEE_TIME_DETAILS": var detailservice = _builder.GetRequiredService(); var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(detailtask); - var detailresult = await detailservice.GetDataPaged(requestInputBase); - return Ok(detailresult.Value); + var detailresult = await detailservice.GetTaskDataPaged(requestInputBase); + return Ok(detailresult); case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据 var materialservice = _builder.GetRequiredService(); var materialtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(materialtask); - var materialresult = await materialservice.GetDataPaged(requestInputBase); - return Ok(materialresult.Value); + var materialresult = await materialservice.GetTaskDataPaged(requestInputBase); + return Ok(materialresult); case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备 var eqservice = _builder.GetRequiredService(); var eqtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(eqtask); - var eqresult = await eqservice.GetDataPaged(requestInputBase); - return Ok(eqresult.Value); + var eqresult = await eqservice.GetTaskDataPaged(requestInputBase); + return Ok(eqresult); case "SUPPLIER_PRO_PROCESS"://工艺 var processservice = _builder.GetRequiredService(); var processtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(processtask); - var processresult = await processservice.GetDataPaged(requestInputBase); - return Ok(processresult.Value); + var processresult = await processservice.GetTaskDataPaged(requestInputBase); + return Ok(processresult); From 1d1edf6ad7882f569c28652cd3064ca8c5281802 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Fri, 6 Jun 2025 13:48:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E6=95=B0=E6=8D=AE=E4=BB=BB=E5=8A=A1=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/TaskSubService.cs | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/API/Wood.Service/Controllers/TaskSubService.cs b/API/Wood.Service/Controllers/TaskSubService.cs index ef788d8..dc20c97 100644 --- a/API/Wood.Service/Controllers/TaskSubService.cs +++ b/API/Wood.Service/Controllers/TaskSubService.cs @@ -54,13 +54,13 @@ namespace Wood.Service.Controllers var tablename = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName").Value; switch (tablename) { - case "SUPPLIER_PRO_MATERIAL_STOCK": + 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 stockresult = await stockservice.GetTaskDataPaged(requestInputBase); return Ok(stockresult); - case "SUPPLIER_PRO_SCHEDULING": + case "SUPPLIER_PRO_SCHEDULING"://排产数据 var schedservice = _builder.GetRequiredService(); var schedtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); @@ -68,7 +68,7 @@ namespace Wood.Service.Controllers var schedresult = await schedservice.GetTaskDataPaged(requestInputBase); return Ok(schedresult); - case "SUPPLIER_INFO": + case "SUPPLIER_INFO"://供应商基础信息 var infoservice = _builder.GetRequiredService(); var infotask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); @@ -100,14 +100,14 @@ namespace Wood.Service.Controllers var cpsresult = await cpsservice.GetTaskDataPaged(requestInputBase); return Ok(cpsresult); - case "SUPPLIER_PRO_DATA": + case "SUPPLIER_PRO_DATA"://生产过程数据 var dataservice = _builder.GetRequiredService(); var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(datatask); var dataresult = await dataservice.GetTaskDataPaged(requestInputBase); return Ok(dataresult); - case "SUPPLIER_PRO_FIRST_PASSYIELD": + case "SUPPLIER_PRO_FIRST_PASSYIELD"://产品一次合格率 var passyieldservice = _builder.GetRequiredService(); var passyieldtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); @@ -116,35 +116,35 @@ namespace Wood.Service.Controllers return Ok(passyieldresult); - case "SUPPLIER_PRO_STATION_FIRST_PASSYIELD": + case "SUPPLIER_PRO_STATION_FIRST_PASSYIELD"://工位一次合格率 var pasyservice = _builder.GetRequiredService(); var pasytask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(pasytask); var pasyresult = await pasyservice.GetTaskDataPaged(requestInputBase); return Ok(pasyresult); - case "SUPPLIER_PRO_FLAW": + case "SUPPLIER_PRO_FLAW"://缺陷业务数据 var flawservice = _builder.GetRequiredService(); var flawtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(flawtask); var flawresult = await flawservice.GetTaskDataPaged(requestInputBase); return Ok(flawresult); - case "SUPPLIER_PRO_ENVIRONMENT": + case "SUPPLIER_PRO_ENVIRONMENT"://环境业务数据 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); return Ok(envresult); - case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE": + case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE"://设备OEE达成率 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); return Ok(rateresult); - case "SUPPLIER_PRO_OEE_TIME_DETAILS": + case "SUPPLIER_PRO_OEE_TIME_DETAILS"://OEE时间明细 var detailservice = _builder.GetRequiredService(); var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(detailtask); @@ -157,7 +157,14 @@ namespace Wood.Service.Controllers requestInputBase.Condition.Filters.Remove(materialtask); var materialresult = await materialservice.GetTaskDataPaged(requestInputBase); return Ok(materialresult); - + + case "SUPPLIER_PRO_ATTACHMENT_DATA":// 附件类数据 + 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); + return Ok(attachment_dataresult); + case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备 var eqservice = _builder.GetRequiredService(); var eqtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); From 8d6d2e31b9498ce579a887531f9fedbc9ec22110 Mon Sep 17 00:00:00 2001 From: me Date: Fri, 6 Jun 2025 14:09:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CheryRecurringJobInputPageController.cs | 10 ++++++++-- .../Controllers/CheryRecurringJobOutPageController.cs | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs index 252c614..8388d68 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs @@ -19,6 +19,7 @@ using TaskManager.Contracts.Dtos; using TaskManager.Entity; using TaskManager.EntityFramework; using TaskManager.EntityFramework.Repository; +using Wood.Util; using Wood.Util.Filters; using static Dapper.SqlMapper; @@ -242,14 +243,19 @@ namespace TaskManager.Controllers [HttpPut("{id}")] public async Task Update(T entity) { + if (entity.UId == 0) + { + throw new Exception("更新时，实体主键UId不能为空或0"); + } var _first = await _repository.GetByIdAsync(entity.UId); if (_first == null) { + throw new Exception($"CheryRecurringJobInputPageController.Update报错：根据UId{entity.UId}没有找到记录"); return new JsonResult(new { Code = 400, Message = "修改失败!" }); } + EntityMapper.Trans(_first, entity, "UId"); - - await _repository.UpdateAsync(entity); + await _repository.UpdateAsync(_first); return new JsonResult(new { Code = 200, Message = "修改成功!" }); } diff --git a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs index 633f6ea..9124fc6 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs @@ -21,6 +21,7 @@ using TaskManager.Controllers; using TaskManager.Entity; using TaskManager.EntityFramework; using TaskManager.EntityFramework.Repository; +using Wood.Util; using Wood.Util.Filters; namespace TaskManager.Controllers @@ -405,14 +406,19 @@ namespace TaskManager.Controllers [HttpPut("{id}")] public async Task Update(T entity) { + if (entity.UId == 0) + { + throw new Exception("更新时，实体主键UId不能为空或0"); + } var _first = await _repository.GetByIdAsync(entity.UId); if (_first == null) { + throw new Exception($"CheryRecurringJobOutPageController.Update报错：根据UId{entity.UId}没有找到记录"); return new JsonResult(new { Code = 400, Message = "修改失败!" }); } + EntityMapper.Trans(_first, entity, "UId"); - - await _repository.UpdateAsync(entity); + await _repository.UpdateAsync(_first); return new JsonResult(new { Code = 200, Message = "修改成功!" }); } ///