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

模具退还

Browse Source
This commit is contained in:
qianjiawei
2023-11-16 17:15:00 +08:00
parent ecfe6fb0b8
commit 5f957eff80
3 changed files with 74 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@ using JNPF.VisualDev.Interfaces;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using NPOI.SS.Formula.Functions;
using SqlSugar;
using Tnb.EquipMgr.Entities;
using Tnb.EquipMgr.Entities.Dto;
@@ -61,7 +62,7 @@ namespace Tnb.EquipMgr
private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
{
Dictionary<string, object>? queryJson = new();
string? requisitionCode = "";
string? code = "";
DateTime[]? requisitionTimeArr = null;
DateTime[]? estimatedReturnArr = null;
if (input != null && !string.IsNullOrEmpty(input.queryJson))
@@ -69,9 +70,9 @@ namespace Tnb.EquipMgr
queryJson = JsonConvert.DeserializeObject<Dictionary<string, object>>(input?.queryJson ?? "");
}
if (queryJson!.TryGetValue("requisition_code", out object? value))
if (queryJson!.TryGetValue("code", out object? value))
{
requisitionCode = value.ToString();
code = value.ToString();
}
if (queryJson!.TryGetValue("requisition_time", out object? value1))
{
@@ -87,7 +88,7 @@ namespace Tnb.EquipMgr
.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)
.WhereIF(!string.IsNullOrEmpty(requisitionCode), (a, b, c, d) => a.code.Contains(requisitionCode))
.WhereIF(!string.IsNullOrEmpty(code), (a, b, c, d) => a.code.Contains(code))
.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