From df0be4e15d7bada7d3e31ae20f141411e1eaaa41 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Thu, 27 Jun 2024 18:03:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E8=A3=85=E4=B8=8B=E5=8F=91=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BC=A0=E5=91=98=E5=B7=A5=E5=B7=A5=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dto/PrdManage/PackSechelToBeIssueListOutput.cs | 1 + ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSechelToBeIssueListOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSechelToBeIssueListOutput.cs index 1f63fced..1cce769e 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSechelToBeIssueListOutput.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSechelToBeIssueListOutput.cs @@ -82,6 +82,7 @@ public string create_time { get; set; } public string workstation_name { get; set; } + public string worker_name { get; set; } } } diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index bae05527..159ef8b9 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -432,8 +432,9 @@ namespace Tnb.ProductionMgr .LeftJoin((a, b, c, d) => a.mo_id == d.id) .LeftJoin((a, b, c, d, e) => a.process_id == e.id) .LeftJoin((a, b,c,d,e,f) => a.workstation_id == f.Id) + .LeftJoin((a, b,c,d,e,f,g)=>a.worker_id==g.Id) .Where((a, b, c, d) => a.parent_id == mo_task_id) - .Select((a, b, c, d, e,f) => new PackSechelToBeIssueListOutput + .Select((a, b, c, d, e,f,g) => new PackSechelToBeIssueListOutput { mo_task_id = a.id, mo_task_code = a.mo_task_code, @@ -443,6 +444,7 @@ namespace Tnb.ProductionMgr workline_name = c.FullName, mo_task_status = a.mo_task_status, workstation_name = f.FullName, + worker_name = g.RealName, scheduled_qty = a.scheduled_qty, plan_qty = d.plan_qty, process_task_qty = a.process_task_qty,