wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

执行代码清理，修复warning

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:59:12 +08:00
parent c6b8dfc861
commit 1dbb17f103
118 changed files with 5046 additions and 4111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs
View File

@@ -51,29 +51,29 @@ namespace Tnb.EquipMgr
private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
{
Dictionary<string, object>? queryJson = new Dictionary<string, object>();
Dictionary<string, object>? queryJson = new();
string? requisitionCode = "";
DateTime[] requisitionTimeArr = null;
DateTime[] estimatedReturnArr = null;
DateTime[]? requisitionTimeArr = null;
DateTime[]? estimatedReturnArr = null;
if (input != null && !string.IsNullOrEmpty(input.queryJson))
{
queryJson = JsonConvert.DeserializeObject<Dictionary<string, object>>(input?.queryJson ?? "");
}
if (queryJson!.TryGetValue("requisition_code", out var value))
if (queryJson!.TryGetValue("requisition_code", out object? value))
{
requisitionCode = value.ToString();
}
if (queryJson!.TryGetValue("requisition_time", out var value1))
if (queryJson!.TryGetValue("requisition_time", out object? value1))
{
requisitionTimeArr = value1.ToObject<long[]>().Select(x => DateTimeOffset.FromUnixTimeSeconds(x / 1000).ToLocalTime().DateTime).ToArray();
}
if (queryJson!.TryGetValue("estimated_return_time", out var value2))
if (queryJson!.TryGetValue("estimated_return_time", out object? value2))
{
estimatedReturnArr = value2.ToObject<long[]>().Select(x => DateTimeOffset.FromUnixTimeSeconds(x / 1000).ToLocalTime().DateTime).ToArray();
}
var result = await _db.Queryable<ToolMoldRequisition>()
SqlSugarPagedList<ToolMoldRequisitionListOutput> result = await _db.Queryable<ToolMoldRequisition>()
.LeftJoin<PrdMoTask>((a, b) => a.mo_task_id == b.id)
.LeftJoin<EqpEquipment>((a, b, c) => a.equip_id == c.id)
.LeftJoin<UserEntity>((a, b, c, d) => a.recipient_id == d.Id)
@@ -105,35 +105,38 @@ namespace Tnb.EquipMgr
await _runService.Create(templateEntity, input);
await _db.Updateable<ToolMolds>().SetColumns(x => x.mold_status == Tnb.BasicData.DictConst.SCTypeId)
_ = await _db.Updateable<ToolMolds>().SetColumns(x => x.mold_status == Tnb.BasicData.DictConst.SCTypeId)
.Where(X => X.id == input.data["mold_id"]).ExecuteCommandAsync();
});
if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
return result.IsSuccess ? "保存成功" : result.ErrorMessage;
return !result.IsSuccess ? throw Oops.Oh(ErrorCode.COM1008) : (dynamic)(result.IsSuccess ? "保存成功" : result.ErrorMessage);
}
[HttpPost]
public async Task<dynamic> GetTools(ToolInput toolinput)
{
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("26149307089941", "在库");
dic.Add("26149309121045", "生产");
dic.Add("26149311082005", "保养");
dic.Add("26149314425877", "报废");
dic.Add("26149312750101", "外协");
dic.Add("26149320818965", "维修");
Dictionary<string, string> dic = new()
{
{ "26149307089941", "在库" },
{ "26149309121045", "生产" },
{ "26149311082005", "保养" },
{ "26149314425877", "报废" },
{ "26149312750101", "外协" },
{ "26149320818965", "维修" }
};
List<dynamic> result = new();
var BasLocations = await _db.Queryable<ToolLocation>().ToListAsync();
var ToolMolds = await _db.Queryable<ToolMolds>()
List<ToolLocation> BasLocations = await _db.Queryable<ToolLocation>().ToListAsync();
List<ToolMolds> ToolMolds = await _db.Queryable<ToolMolds>()
.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)
foreach (ToolMolds tool in ToolMolds)
{
dynamic info = new ExpandoObject();
info.id = tool.id;