This commit is contained in:
2024-05-21 17:22:09 +08:00
parent ccb52b157d
commit d013cbaa90
5 changed files with 23 additions and 2 deletions

View File

@@ -1,6 +1,7 @@
using JNPF.Common.Filter;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
@@ -103,10 +104,11 @@ namespace Tnb.ProductionMgr
.LeftJoin<ToolMolds>((a, b, c, d, e) => a.mold_id == e.id)
.LeftJoin<PrdMo>((a, b, c, d, e, f) => a.mo_id == f.id)
.LeftJoin<EqpEquipment>((a, b, c, d, e, f, g) => g.id == a.eqp_id)
.LeftJoin<OrganizeEntity>((a, b, c, d, e, f, g,h)=>a.workstation_id==h.Id)
.WhereIF(!string.IsNullOrEmpty(moTaskCode), (a, b, c, d) => a.mo_task_code.Contains(moTaskCode))
.WhereIF(!string.IsNullOrEmpty(moTaskStatus), (a, b, c, d) => a.mo_task_status == moTaskStatus)
.Where((a, b, c, d, e, f) => a.schedule_type == 1)
.Select((a, b, c, d, e, f, g) => new PrdMoTaskIssueListOutput
.Select((a, b, c, d, e, f, g,h) => new PrdMoTaskIssueListOutput
{
id = a.id,
mo_task_code = a.mo_task_code,
@@ -114,6 +116,7 @@ namespace Tnb.ProductionMgr
mold_id = e.mold_code + "/" + e.mold_name,
eqp_id = g.code + "/" + g.name,
mo_task_status = d.FullName,
workstation_id = h.FullName,
plan_qty = f.plan_qty,
scheduled_qty = a.scheduled_qty,
create_time = a.create_time == null ? "" : a.create_time.Value.ToString(DbTimeFormat.SS),