From 84e21901f4548f6f2df3560668a0c5a45b51d5b5 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 12 6月 2024 15:32:47 +0800
Subject: [PATCH] 2
---
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
index a5bd838..bf155ef 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
@@ -108,7 +108,7 @@
QualityDataInfoID = process.QualityDataInfoID,
OperationType = process.OperationType,
CreateUserName = process.CreatedUserName
- }).OrderBy(o => o.StartTime)
+ }).OrderByDescending(o => o.StartTime)
.ProjectToType<WorkPieceProcessOutput>()
.ToADPagedListAsync(input.PageNo, input.PageSize);
@@ -206,7 +206,7 @@
EndTime = process.EndTime.ToString(),
//QualityState = process.QualityState,
CreateUserName = process.CreatedUserName
- }).OrderBy(o => o.StartTime).Distinct()
+ }).OrderByDescending(o => o.StartTime).Distinct()
.ProjectToType<WorkPieceProcessExcelOutput>()
.ToListAsync();
@@ -296,6 +296,7 @@
//StartTime = grouped.Key.StartTime,
YieldCount = y.ToList().Count
})
+ .OrderBy(x => x.WorkingProcedureCurrent)
.ToADPagedList(input.PageNo, input.PageSize);
//var workPieceProcesss = await (from process in _workPieceProcessRep.DetachedEntities
--
Gitblit v1.9.3