From d437e53b2eea04f88217d719abc8d34ba5b25c2c Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期五, 10 七月 2020 17:36:41 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.DBManager/MeasurementUnitResultManager.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs b/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
index 346af64..be0bb9e 100644
--- a/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
+++ b/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
@@ -72,11 +72,11 @@
//into pmList
select new MeasurementUnitResult_DTO
{
- ProductionMeasurementRecord= productionMeasurementRecords,
- MeasurementUnitResult= measurementUnitResult
+ ProductionCode = productionMeasurementRecords.ProductionCode,
+ ProductionBarcode = productionMeasurementRecords.ProductionBarcode
};
- var pageList = query.OrderBy(u => u.ProductionMeasurementRecord.OperationStartTime).ToPagedList(request);
+ var pageList = query.OrderBy(u => u.CREATE_TIME).ToPagedList(request);
request.TotalNum = mList.Count();
return pageList;
}
--
Gitblit v1.8.0