From c01cce7ac1dc691c6b667b298ce0637b924102ea Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期二, 14 七月 2020 16:29:09 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.DBManager/MeasurementUnitResultManager.cs | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs b/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
index 346af64..cfd2a15 100644
--- a/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
+++ b/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
@@ -14,7 +14,7 @@
{
public class MeasurementUnitResultManager : ModelManager<MeasurementUnitResult>
{
- DbProviderFactory Dbfactory = SQLiteFactory.Instance;
+ //DbProviderFactory Dbfactory = SQLiteFactory.Instance;
protected override void ActionBeforeNewModel(DBModel context, MeasurementUnitResult config)
{
CheckProductionCodeDuplicate(context, config);
@@ -29,7 +29,7 @@
{
}
- public List<MeasurementUnitResult_DTO> GetMeasurementUnitResult(MeasurementUnitResultRequest request)
+ public List<MeasurementUnitResult> GetMeasurementUnitResult(MeasurementUnitResultRequest request)
{
using (DBModel context = new DBModel())
{
@@ -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))
{
@@ -70,13 +70,12 @@
join measurementUnitResult in mList
on productionMeasurementRecords.ID equals measurementUnitResult.ProductionMeasurementRecordsId
//into pmList
- select new MeasurementUnitResult_DTO
+ select new MeasurementUnitResult
{
- 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