From 05dcc210bf43600a875982b07fb52845716d7145 Mon Sep 17 00:00:00 2001
From: zhoukeda <1315948824@qq.com>
Date: Mon, 31 Jul 2023 11:59:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=A1=91=E6=8C=A4=E5=87=BA=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=8D=95=E4=B8=8B=E5=8F=91=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dto/PrdManage/PrdMoTaskIssueListOutput.cs              | 1 +
 ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs   | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskIssueListOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskIssueListOutput.cs
index 722ddda9..c648d5f0 100644
--- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskIssueListOutput.cs
+++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskIssueListOutput.cs
@@ -6,6 +6,7 @@ namespace Tnb.ProductionMgr.Entities.Dto
         public string mo_task_code { get; set; }
         public string material_id { get; set; }
         public string mold_id  { get; set; }
+        public string eqp_id  { get; set; }
         public string mo_task_status { get; set; }
         public int? plan_qty { get; set; }
         public int? scheduled_qty { get; set; }
diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs
index 3524721d..9a07fb20 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs
@@ -114,21 +114,22 @@ namespace Tnb.ProductionMgr
                 .LeftJoin<DictionaryDataEntity>((a, b, c, d) => c.Id == d.DictionaryTypeId && a.mo_task_status == d.EnCode)
                 .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)
                 .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)
-                .OrderByDescending(a=>a.create_time)
-                .Select((a, b, c, d,e,f) => new PrdMoTaskIssueListOutput
+                .Select((a, b, c, d,e,f,g) => new PrdMoTaskIssueListOutput
                 {
                     id = a.id,
                     mo_task_code = a.mo_task_code,
                     material_id = b.code+"/"+b.name,
                     mold_id = e.mold_code+"/"+e.mold_name,
+                    eqp_id = g.code+"/"+g.name,
                     mo_task_status = d.FullName,
                     plan_qty = f.plan_qty,
                     scheduled_qty = a.scheduled_qty,
                     create_time = a.create_time==null ? "" :a.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
-                }).ToPagedListAsync(input.currentPage, input.pageSize);
+                }).OrderByDescending(a=>a.create_time).ToPagedListAsync(input.currentPage, input.pageSize);
             return PageResult<PrdMoTaskIssueListOutput>.SqlSugarPageResult(result);
         }
     }