RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
qianhao.xu 2024-11-29 10:33:48 +08:00
parent 225f6c93a7
commit 72b9c962cd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DOAN.Service/MES/product/ProReportworkService.cs
View File

@ -108,7 +108,6 @@ namespace DOAN.Service.MES.product
var response = Context.Queryable<ProWorkorder>()
.LeftJoin<ProReportwork>((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<ProReportworkDto>(parm);