From f39f00ee0ee41e169fa24ccb85b4af36090dbd25 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期三, 08 七月 2020 16:38:51 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.DBManager/MeasurementUnitResultManager.cs | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs b/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
index 6e7a08e..346af64 100644
--- a/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
+++ b/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
@@ -29,23 +29,56 @@
{
}
- public List<MeasurementUnitResult> GetMeasurementUnitResult()
+ public List<MeasurementUnitResult_DTO> GetMeasurementUnitResult(MeasurementUnitResultRequest request)
{
using (DBModel context = new DBModel())
{
- var list = context.MeasurementUnitResult.Where(u => u.IS_DELETED == 0);
+ var mList = context.MeasurementUnitResult.Where(u => u.IS_DELETED == 0);
+ var pList = context.ProductionMeasurementRecords.Where(u => u.IS_DELETED == 0);
- //if (!string.IsNullOrWhiteSpace(productionBatchNO))
- //{
- // list = list.Where(u => u.ProductionBatchNO.Contains(productionBatchNO));
- //}
- //if (!string.IsNullOrWhiteSpace(pid))
- //{
- // list = list.Where(u => u.PId.Contains(pid));
- //}
+ if (!string.IsNullOrWhiteSpace(request.ProductionBarcode))
+ {
+ pList = pList.Where(u => u.ProductionBarcode.Contains(request.ProductionBarcode));
+ }
+ if (!string.IsNullOrWhiteSpace(request.ProductionCode))
+ {
+ pList = pList.Where(u => u.ProductionCode.Contains(request.ProductionCode));
+ }
+ if (request.StartTime != null)
+ {
+ pList = pList.Where(u => u.OperationStartTime >= request.StartTime);
+ }
+ if (request.EndTime != null)
+ {
+ pList = pList.Where(u => u.OperationStartTime <= request.EndTime);
+ }
+ //mList
+ if (!string.IsNullOrWhiteSpace(request.MeasurementName))
+ {
+ mList = mList.Where(u => u.MeasurementName.Contains(request.MeasurementName));
+ }
+ if (!string.IsNullOrWhiteSpace(request.MeasurementResult))
+ {
+ mList = mList.Where(u => u.MeasurementResult==request.MeasurementResult);
+ }
+ if (!string.IsNullOrWhiteSpace(request.MeasurementType))
+ {
+ mList = mList.Where(u => u.MeasurementType == request.MeasurementType);
+ }
- var resultList = list.ToList();
- return resultList;
+ var query = from productionMeasurementRecords in pList
+ join measurementUnitResult in mList
+ on productionMeasurementRecords.ID equals measurementUnitResult.ProductionMeasurementRecordsId
+ //into pmList
+ select new MeasurementUnitResult_DTO
+ {
+ ProductionMeasurementRecord= productionMeasurementRecords,
+ MeasurementUnitResult= measurementUnitResult
+
+ };
+ var pageList = query.OrderBy(u => u.ProductionMeasurementRecord.OperationStartTime).ToPagedList(request);
+ request.TotalNum = mList.Count();
+ return pageList;
}
}
--
Gitblit v1.8.0