From df1b6d941fc6c6fe9672e84e7ed7cd7e1c1ec8ed Mon Sep 17 00:00:00 2001 From: qianjiawei <1184704771@qq.com> Date: Thu, 21 Sep 2023 10:16:59 +0800 Subject: [PATCH 1/2] 1 --- EquipMgr/Tnb.EquipMgr.Entities/Dto/ToolInput.cs | 15 +++++++++++++++ .../Tnb.EquipMgr/ToolMoldMaintainRunService.cs | 1 - .../Tnb.EquipMgr/ToolMoldRequisitionService.cs | 14 +++++++++++--- QcMgr/Tnb.QcMgr/QcCheckTaskService.cs | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Dto/ToolInput.cs diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/ToolInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/ToolInput.cs new file mode 100644 index 00000000..cae96d36 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/ToolInput.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tnb.EquipMgr.Entities +{ + public class ToolInput + { + public string? sort { get; set; } + public string? keyword { get; set; } + public string? status { get; set; } + } +} diff --git a/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRunService.cs b/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRunService.cs index 2fe6f947..6fb1fa6c 100644 --- a/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRunService.cs +++ b/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRunService.cs @@ -99,7 +99,6 @@ namespace Tnb.EquipMgr } [HttpGet] - [AllowAnonymous] public async Task GetMaintainInfo([FromQuery] MaintainInfoQueryinput input) { Dictionary dicstatus = new Dictionary(); diff --git a/EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs b/EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs index f4a3d718..0fbbb9b8 100644 --- a/EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs +++ b/EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs @@ -113,7 +113,8 @@ namespace Tnb.EquipMgr if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008); return result.IsSuccess ? "保存成功" : result.ErrorMessage; } - public async Task GetTools() + [HttpPost] + public async Task GetTools(ToolInput toolinput) { Dictionary dic = new Dictionary(); dic.Add("26149307089941", "在库"); @@ -123,7 +124,15 @@ namespace Tnb.EquipMgr dic.Add("26149312750101", "外协"); dic.Add("26149320818965", "维修"); List result = new(); - var ToolMolds = await _db.Queryable().ToListAsync(); + var ToolMolds = await _db.Queryable() + .WhereIF(!string.IsNullOrEmpty(toolinput.keyword),p=>p.mold_code!.Contains(toolinput.keyword!)|| p.mold_name!.Contains(toolinput.keyword!)) + .WhereIF(!string.IsNullOrEmpty(toolinput.status), p => p.mold_status== dic.Where(p=>p.Value== toolinput.status).First().Key) + .ToListAsync(); + if (string.IsNullOrEmpty(toolinput.sort)) + { + if(toolinput.sort== "mold_code") + ToolMolds= ToolMolds.OrderByDescending(p=>p.mold_code).ToList(); + } foreach (var tool in ToolMolds) { dynamic info = new ExpandoObject(); @@ -132,7 +141,6 @@ namespace Tnb.EquipMgr info.mold_status= dic.Where(p=>p.Key==tool.mold_status).Any()? dic.Where(p => p.Key == tool.mold_status).First().Value:""; info.warehosue_id=tool.warehosue_id; info.location_id=tool.location_id; - result.Add(info); } diff --git a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs index f87d775f..5634bf81 100644 --- a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs +++ b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs @@ -241,7 +241,7 @@ namespace Tnb.QcMgr insert.itemid = QcCheckExecD.itemid; insert.create_id = QcCheckExecD.create_id; insert.create_time = QcCheckExecD.create_time; - insert.postdata = + insert.postdata = item.postItemForm; insert.result = item.result; insert.checkindex = (i + 1).ToString(); QcCheckExecDinsert.Add(insert); From b921a38762621e7330cc308cbb08f8cd81d5d165 Mon Sep 17 00:00:00 2001 From: qianjiawei <1184704771@qq.com> Date: Thu, 21 Sep 2023 17:31:24 +0800 Subject: [PATCH 2/2] 11 --- .../Tnb.EquipMgr/ToolMoldRequisitionService.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs b/EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs index 0fbbb9b8..e7cbfec5 100644 --- a/EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs +++ b/EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs @@ -15,6 +15,7 @@ using JNPF.VisualDev.Interfaces; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using SqlSugar; +using Tnb.BasicData.Entities; using Tnb.EquipMgr.Entities; using Tnb.EquipMgr.Entities.Dto; using Tnb.EquipMgr.Interfaces; @@ -124,27 +125,28 @@ namespace Tnb.EquipMgr dic.Add("26149312750101", "外协"); dic.Add("26149320818965", "维修"); List result = new(); + var BasLocations = await _db.Queryable().ToListAsync(); var ToolMolds = await _db.Queryable() .WhereIF(!string.IsNullOrEmpty(toolinput.keyword),p=>p.mold_code!.Contains(toolinput.keyword!)|| p.mold_name!.Contains(toolinput.keyword!)) .WhereIF(!string.IsNullOrEmpty(toolinput.status), p => p.mold_status== dic.Where(p=>p.Value== toolinput.status).First().Key) .ToListAsync(); if (string.IsNullOrEmpty(toolinput.sort)) - { - if(toolinput.sort== "mold_code") - ToolMolds= ToolMolds.OrderByDescending(p=>p.mold_code).ToList(); + { + if (toolinput.sort == "mold_code") + ToolMolds = ToolMolds.OrderByDescending(p => p.mold_code).ToList(); } foreach (var tool in ToolMolds) { dynamic info = new ExpandoObject(); + info.id=tool.id; info.mold_code=tool.mold_code; info.mold_name = tool.mold_name; info.mold_status= dic.Where(p=>p.Key==tool.mold_status).Any()? dic.Where(p => p.Key == tool.mold_status).First().Value:""; info.warehosue_id=tool.warehosue_id; - info.location_id=tool.location_id; + info.location_id= BasLocations.Where(p => p.id == tool.location_id).Any() ? BasLocations.Where(p => p.id == tool.location_id).First().location_code : ""; result.Add(info); } - - return ToolMolds; + return result; } } } \ No newline at end of file