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

去除引用common.props

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:35:59 +08:00
parent 6a2154edd9
commit c6b8dfc861
810 changed files with 3910 additions and 6695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
using System.Dynamic;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Enums;
using JNPF.Common.Extension;
using JNPF.Common.Filter;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
@@ -15,7 +14,6 @@ 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;
@@ -57,42 +55,42 @@ namespace Tnb.EquipMgr
string? requisitionCode = "";
DateTime[] requisitionTimeArr = null;
DateTime[] estimatedReturnArr = null;
if (input!=null && !string.IsNullOrEmpty(input.queryJson))
if (input != null && !string.IsNullOrEmpty(input.queryJson))
{
queryJson = JsonConvert.DeserializeObject<Dictionary<string, object>>(input?.queryJson ?? "");
}
if (queryJson!.TryGetValue("requisition_code", out var value))
{
requisitionCode = value.ToString();
}
if (queryJson!.TryGetValue("requisition_time", out var value1))
{
requisitionTimeArr = value1.ToObject<long[]>().Select(x=>DateTimeOffset.FromUnixTimeSeconds(x/1000).ToLocalTime().DateTime).ToArray();
requisitionTimeArr = value1.ToObject<long[]>().Select(x => DateTimeOffset.FromUnixTimeSeconds(x / 1000).ToLocalTime().DateTime).ToArray();
}
if (queryJson!.TryGetValue("estimated_return_time", out var value2))
{
estimatedReturnArr = value2.ToObject<long[]>().Select(x=>DateTimeOffset.FromUnixTimeSeconds(x/1000).ToLocalTime().DateTime).ToArray();
estimatedReturnArr = value2.ToObject<long[]>().Select(x => DateTimeOffset.FromUnixTimeSeconds(x / 1000).ToLocalTime().DateTime).ToArray();
}
var 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)
.LeftJoin<ToolMolds>((a,b,c,d,e)=>a.mold_id==e.id)
.LeftJoin<ToolMolds>((a, b, c, d, e) => a.mold_id == e.id)
.WhereIF(!string.IsNullOrEmpty(requisitionCode), (a, b, c, d) => a.code.Contains(requisitionCode))
.WhereIF(requisitionTimeArr!=null, (a, b, c, d) => a.requisition_time>=requisitionTimeArr[0] && a.requisition_time<=requisitionTimeArr[1])
.WhereIF(estimatedReturnArr!=null, (a, b, c, d) => a.estimated_return_time>=estimatedReturnArr[0] && a.estimated_return_time<=estimatedReturnArr[1])
.Select((a, b, c, d,e) => new ToolMoldRequisitionListOutput
.WhereIF(requisitionTimeArr != null, (a, b, c, d) => a.requisition_time >= requisitionTimeArr[0] && a.requisition_time <= requisitionTimeArr[1])
.WhereIF(estimatedReturnArr != null, (a, b, c, d) => a.estimated_return_time >= estimatedReturnArr[0] && a.estimated_return_time <= estimatedReturnArr[1])
.Select((a, b, c, d, e) => new ToolMoldRequisitionListOutput
{
id = a.id,
code = a.code,
mold_id = e.mold_code,
mo_task_id = b.mo_task_code,
equip_id = c.code+"/"+c.name,
equip_id = c.code + "/" + c.name,
recipient_id = d.RealName,
estimated_return_time = a.estimated_return_time==null ? "" : a.estimated_return_time.Value.ToString("yyyy-MM-dd"),
requisition_time = a.requisition_time==null ? "" : a.requisition_time.Value.ToString("yyyy-MM-dd"),
estimated_return_time = a.estimated_return_time == null ? "" : a.estimated_return_time.Value.ToString("yyyy-MM-dd"),
requisition_time = a.requisition_time == null ? "" : a.requisition_time.Value.ToString("yyyy-MM-dd"),
remark = a.remark
}).ToPagedListAsync(input.currentPage, input.pageSize);
@@ -127,8 +125,8 @@ namespace Tnb.EquipMgr
List<dynamic> result = new();
var BasLocations = await _db.Queryable<ToolLocation>().ToListAsync();
var 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)
.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))
{
@@ -138,12 +136,12 @@ namespace Tnb.EquipMgr
foreach (var tool in ToolMolds)
{
dynamic info = new ExpandoObject();
info.id=tool.id;
info.mold_code=tool.mold_code;
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= BasLocations.Where(p => p.id == tool.location_id).Any() ? BasLocations.Where(p => p.id == tool.location_id).First().location_code : "";
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 = BasLocations.Where(p => p.id == tool.location_id).Any() ? BasLocations.Where(p => p.id == tool.location_id).First().location_code : "";
result.Add(info);
}
return result;