From 81480d62561dcb75a1fc968814ace1368fe5181b Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期四, 16 七月 2020 11:57:08 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.DBManager/MeasurementUnitResultManager.cs | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs b/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
index 686a1e1..0d49ead 100644
--- a/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
+++ b/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
@@ -59,7 +59,7 @@
}
if (!string.IsNullOrWhiteSpace(request.MeasurementResult))
{
- mList = mList.Where(u => u.MeasurementResult==request.MeasurementResult);
+ mList = mList.Where(u => u.MeasurementResult == request.MeasurementResult);
}
if (!string.IsNullOrWhiteSpace(request.MeasurementType))
{
@@ -73,10 +73,18 @@
select new MeasurementUnitResult_DTO
{
ProductionCode = productionMeasurementRecords.ProductionCode,
- ProductionBarcode = productionMeasurementRecords.ProductionBarcode
+ ProductionBarcode = productionMeasurementRecords.ProductionBarcode,
+ ProductionMeasurementRecordsId = productionMeasurementRecords.ID,
+ OperationStartTime= productionMeasurementRecords.OperationStartTime,
+ OperationEndTime = productionMeasurementRecords.OperationEndTime,
+ Id= measurementUnitResult.ID,
+ MeasurementName= measurementUnitResult.MeasurementName,
+ MeasurementType = measurementUnitResult.MeasurementType,
+ MeasurementValue = measurementUnitResult.MeasurementValue,
+ MeasurementResult = measurementUnitResult.MeasurementResult
};
- var pageList = query.OrderBy(u => u.CREATE_TIME).ToPagedList(request);
+ var pageList = query.OrderBy(u => u.OperationStartTime).ToPagedList(request);
request.TotalNum = mList.Count();
return pageList;
}
--
Gitblit v1.8.0