提报质量bug

QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs

@@ -11,6 +11,8 @@ using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using SqlSugar;
 using Tnb.BasicData.Entities;
+using Tnb.EquipMgr.Entities;
+using Tnb.ProductionMgr.Entities;
 using Tnb.QcMgr.Entities;
 
 namespace Tnb.QcMgr
@@ -113,11 +115,13 @@ namespace Tnb.QcMgr
                 .LeftJoin<BasProcess>((a, b, c) => a.processid == c.id)
                 .LeftJoin<OrganizeEntity>((a, b, c, d) => a.workid == d.Id)
                 .LeftJoin<UserEntity>((a, b, c, d, e) => a.execuser == e.Id)
+                .LeftJoin<PrdMoTask>((a,b,c,d,e,f)=>a.mo_task_code==f.mo_task_code)
+                .LeftJoin<EqpEquipment>((a,b,c,d,e,f,g)=>f.eqp_id==g.id)
                 .WhereIF(!string.IsNullOrEmpty(materialid), (a, b, c, d, e) => a.materialid == materialid)
                 .WhereIF(!string.IsNullOrEmpty(checktype), (a, b, c, d, e) => a.checktype == checktype)
                 .WhereIF(!string.IsNullOrEmpty(status), (a, b, c, d, e) => a.status == status)
                 //  .Where((a, b, c, d, e) => a.status == list.Where(p => p.FullName == "已完成").First().Id)
-                .Select((a, b, c, d, e) => new QcCheckExecHOut
+                .Select((a, b, c, d, e,f,g) => new QcCheckExecHOut
                 {
                     id = a.id,
                     bill_code = a.bill_code,
@@ -132,6 +136,7 @@ namespace Tnb.QcMgr
                     tasktime = a.tasktime ?? "",
                     exectime = a.exectime ?? "",
                     execuser = e.RealName ?? "",
+                    equip_name = g.name,
                 }).OrderByDescending(expression).ToPagedListAsync(input.currentPage, input.pageSize);
 
             foreach (QcCheckExecHOut? item in result.list)