diff --git a/DOAN.Service/MES/product/ProReportworkService.cs b/DOAN.Service/MES/product/ProReportworkService.cs index 4644ad0..d011f6d 100644 --- a/DOAN.Service/MES/product/ProReportworkService.cs +++ b/DOAN.Service/MES/product/ProReportworkService.cs @@ -108,7 +108,6 @@ namespace DOAN.Service.MES.product var response = Context.Queryable() .LeftJoin((w, r) => w.Workorder == r.FkWorkorder) .Where(predicate.ToExpression()) - .OrderBy((w,r)=>new {r.GroupCode,w.ProductionCode}) .Select((w, r) => new ProReportworkDto { Id = r.Id, @@ -129,6 +128,8 @@ namespace DOAN.Service.MES.product Status = w.Status, Beat = w.Beat }, true) + .MergeTable() + .OrderBy(t=>new {t.GroupCode,t.ProductionCode}) .ToPage_NO_Convert(parm);