1
This commit is contained in:
@@ -72,9 +72,10 @@ namespace ZR.Service.mes.qc
|
|||||||
List<QcQualityStatisticsFirst> data = Context
|
List<QcQualityStatisticsFirst> data = Context
|
||||||
.Queryable<QcQualityStatisticsFirst>()
|
.Queryable<QcQualityStatisticsFirst>()
|
||||||
.Where(predicate)
|
.Where(predicate)
|
||||||
.OrderByIF(sortType == 0, it => it.StartTime, OrderByType.Asc)
|
|
||||||
.OrderByIF(sortType == 1, it => it.QualifiedRate, OrderByType.Desc)
|
.OrderByIF(sortType == 1, it => it.QualifiedRate, OrderByType.Desc)
|
||||||
.OrderByIF(sortType == 2, it => it.ProductDescription, OrderByType.Asc)
|
.OrderByIF(sortType == 2, it => it.ProductDescription, OrderByType.Asc)
|
||||||
|
.OrderByIF(sortType == 0 || sortType == 2, it => it.StartTime, OrderByType.Asc)
|
||||||
.OrderByIF(sortType == 3, it => it.FinishedPartNumber, OrderByType.Asc)
|
.OrderByIF(sortType == 3, it => it.FinishedPartNumber, OrderByType.Asc)
|
||||||
.OrderBy(it => it.WorkorderId)
|
.OrderBy(it => it.WorkorderId)
|
||||||
.OrderBy(it => it.Remark2)
|
.OrderBy(it => it.Remark2)
|
||||||
@@ -155,9 +156,9 @@ namespace ZR.Service.mes.qc
|
|||||||
List<QcQualityStatisticsAgain> data = Context
|
List<QcQualityStatisticsAgain> data = Context
|
||||||
.Queryable<QcQualityStatisticsAgain>()
|
.Queryable<QcQualityStatisticsAgain>()
|
||||||
.Where(predicate)
|
.Where(predicate)
|
||||||
.OrderByIF(sortType == 0, it => it.StartTime, OrderByType.Asc)
|
|
||||||
.OrderByIF(sortType == 1, it => it.QualifiedRate, OrderByType.Desc)
|
.OrderByIF(sortType == 1, it => it.QualifiedRate, OrderByType.Desc)
|
||||||
.OrderByIF(sortType == 2, it => it.ProductDescription, OrderByType.Asc)
|
.OrderByIF(sortType == 2, it => it.ProductDescription, OrderByType.Asc)
|
||||||
|
.OrderByIF(sortType == 0 || sortType == 2, it => it.StartTime, OrderByType.Asc)
|
||||||
.OrderByIF(sortType == 3, it => it.FinishedPartNumber, OrderByType.Asc)
|
.OrderByIF(sortType == 3, it => it.FinishedPartNumber, OrderByType.Asc)
|
||||||
.OrderBy(it => it.WorkorderId)
|
.OrderBy(it => it.WorkorderId)
|
||||||
.OrderBy(it => it.Remark2)
|
.OrderBy(it => it.Remark2)
|
||||||
@@ -238,9 +239,9 @@ namespace ZR.Service.mes.qc
|
|||||||
List<QcQualityStatisticsFinal> data = Context
|
List<QcQualityStatisticsFinal> data = Context
|
||||||
.Queryable<QcQualityStatisticsFinal>()
|
.Queryable<QcQualityStatisticsFinal>()
|
||||||
.Where(predicate)
|
.Where(predicate)
|
||||||
.OrderByIF(sortType == 0, it => it.StartTime, OrderByType.Asc)
|
|
||||||
.OrderByIF(sortType == 1, it => it.QualifiedRate, OrderByType.Desc)
|
.OrderByIF(sortType == 1, it => it.QualifiedRate, OrderByType.Desc)
|
||||||
.OrderByIF(sortType == 2, it => it.ProductDescription, OrderByType.Asc)
|
.OrderByIF(sortType == 2, it => it.ProductDescription, OrderByType.Asc)
|
||||||
|
.OrderByIF(sortType == 0 || sortType == 2, it => it.StartTime, OrderByType.Asc)
|
||||||
.OrderByIF(sortType == 3, it => it.FinishedPartNumber, OrderByType.Asc)
|
.OrderByIF(sortType == 3, it => it.FinishedPartNumber, OrderByType.Asc)
|
||||||
.OrderBy(it => it.WorkorderId)
|
.OrderBy(it => it.WorkorderId)
|
||||||
.OrderBy(it => it.Remark2)
|
.OrderBy(it => it.Remark2)
|
||||||
@@ -321,9 +322,9 @@ namespace ZR.Service.mes.qc
|
|||||||
List<QcQualityStatisticsTotal> data = Context
|
List<QcQualityStatisticsTotal> data = Context
|
||||||
.Queryable<QcQualityStatisticsTotal>()
|
.Queryable<QcQualityStatisticsTotal>()
|
||||||
.Where(predicate)
|
.Where(predicate)
|
||||||
.OrderByIF(sortType == 0, it => it.StartTime, OrderByType.Asc)
|
|
||||||
.OrderByIF(sortType == 1, it => it.QualifiedRate, OrderByType.Desc)
|
.OrderByIF(sortType == 1, it => it.QualifiedRate, OrderByType.Desc)
|
||||||
.OrderByIF(sortType == 2, it => it.ProductDescription, OrderByType.Asc)
|
.OrderByIF(sortType == 2, it => it.ProductDescription, OrderByType.Asc)
|
||||||
|
.OrderByIF(sortType == 0 || sortType == 2, it => it.StartTime, OrderByType.Asc)
|
||||||
.OrderByIF(sortType == 3, it => it.FinishedPartNumber, OrderByType.Asc)
|
.OrderByIF(sortType == 3, it => it.FinishedPartNumber, OrderByType.Asc)
|
||||||
.OrderBy(it => it.WorkorderId)
|
.OrderBy(it => it.WorkorderId)
|
||||||
.OrderBy(it => it.Remark2)
|
.OrderBy(it => it.Remark2)
|
||||||
|
|||||||
Reference in New Issue
Block a user