DF22001YiQi.git

			@@ -285,10 +285,35 @@
			Remarks = m.a.Remarks,
			UpdateTime = m.a.UpdatedTime,
			})
			.ProjectToType<QualityDataInfoOutput>()
			.OrderByDescending(o => o.UpdateTime)
			.ToADPagedListAsync(input.PageNo, input.PageSize);
			return qualityDataInfos;
			.ProjectToType<QualityDataInfoOutput>().ToListAsync();

			if (input.EquipmentID.Equals("EOP10") && !string.IsNullOrEmpty(input.WorkingProcedure) && input.WorkingProcedure.Equals("OP10"))
			{
			qualityDataInfos = qualityDataInfos.OrderByDescending(x => x.OP10QualityReceiveTime).ToList();
			}
			else if (input.EquipmentID.Equals("EOP10") && !string.IsNullOrEmpty(input.WorkingProcedure) && input.WorkingProcedure.Equals("OP40"))
			{
			qualityDataInfos = qualityDataInfos.OrderByDescending(x => x.OP40QualityReceiveTime).ToList();
			}
			else if (input.EquipmentID.Equals("EOP20"))
			{
			qualityDataInfos = qualityDataInfos.OrderByDescending(x => x.OP20QualityReceiveTime).ToList();
			}
			else if (input.EquipmentID.Equals("EOP30"))
			{
			qualityDataInfos = qualityDataInfos.OrderByDescending(x => x.OP30QualityReceiveTime).ToList();
			}
			else if (input.EquipmentID.Equals("EOP60"))
			{
			qualityDataInfos = qualityDataInfos.OrderByDescending(x => x.OP60QualityReceiveTime).ToList();
			}
			else if (input.EquipmentID.Equals("EOP80"))
			{
			qualityDataInfos = qualityDataInfos.OrderByDescending(x => x.OP80QualityReceiveTime).ToList();
			}

			var retData = qualityDataInfos.ToADPagedList(input.PageNo, input.PageSize);
			return retData;
			}