From 3ae459e2e79e567dfd4a552a3b5b8c1fce495167 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 16 七月 2020 17:23:35 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.DBManager/MeasurementUnitResultManager.cs | 98 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 94 insertions(+), 4 deletions(-)
diff --git a/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs b/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
index cfd2a15..29a5303 100644
--- a/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
+++ b/src/Bro.M071.DBManager/MeasurementUnitResultManager.cs
@@ -1,6 +1,7 @@
锘縰sing Bro.Common.Helper;
using Bro.M071.Model;
using Bro.M071.Model.Model;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -29,7 +30,7 @@
{
}
- public List<MeasurementUnitResult> GetMeasurementUnitResult(MeasurementUnitResultRequest request)
+ public List<MeasurementUnitResult_DTO> GetMeasurementUnitResult(MeasurementUnitResultRequest request)
{
using (DBModel context = new DBModel())
{
@@ -70,17 +71,106 @@
join measurementUnitResult in mList
on productionMeasurementRecords.ID equals measurementUnitResult.ProductionMeasurementRecordsId
//into pmList
- select new MeasurementUnitResult
+ 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;
}
}
+
+ public ProductionMeasurementUnitResultExportDataSet GetProductionMeasurementUnitResultExportDataSet(MeasurementUnitResultRequest request)
+ {
+ ProductionMeasurementUnitResultExportDataSet productionMeasurementUnitResultExportDataSet = new ProductionMeasurementUnitResultExportDataSet();
+ using (DBModel context = new DBModel())
+ {
+ var mList = context.MeasurementUnitResult.Where(u => u.IS_DELETED == 0);
+ var pList = context.ProductionMeasurementRecords.Where(u => u.IS_DELETED == 0);
+ var kList = context.KeyUnitData.Where(u => u.IS_DELETED == 0);
+
+ 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);
+ }
+
+ productionMeasurementUnitResultExportDataSet.ProductionMeasurementRecordList = pList.ToList();
+ var measurementUnitResults = from productionMeasurementRecords in pList
+ join measurementUnitResult in mList on productionMeasurementRecords.ID equals measurementUnitResult.ProductionMeasurementRecordsId
+ select new MeasurementUnitResult_DTO
+ {
+ ProductionCode = productionMeasurementRecords.ProductionCode,
+ 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
+ };
+
+ productionMeasurementUnitResultExportDataSet.MeasurementUnitResultList = measurementUnitResults.ToList();
+
+ var keyUnitDataQuery = from productionMeasurementRecords in pList
+ join keyUnitData in kList on productionMeasurementRecords.ID equals
+ keyUnitData.ProductionMeasurementRecordsId
+ select new KeyUnitData_DTO
+ {
+ ProductionCode = productionMeasurementRecords.ProductionCode,
+ ProductionBarcode = productionMeasurementRecords.ProductionBarcode,
+ ProductionMeasurementRecordsId = productionMeasurementRecords.ID,
+
+ Id = keyUnitData.ID,
+ Key = keyUnitData.Key,
+ MeasurementItem = keyUnitData.MeasurementItem,
+ ItemValue = keyUnitData.ItemValue,
+ };
+ productionMeasurementUnitResultExportDataSet.KeyUnitDataList = keyUnitDataQuery.ToList();
+
+ return productionMeasurementUnitResultExportDataSet;
+ }
+ }
public void BatchAddMeasurementUnitResult(List<MeasurementUnitResult> records)
{
try
--
Gitblit v1.8.0