From 1bc2df66bc88a6405df345dccc24a5031e18b592 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期一, 21 十二月 2020 09:54:48 +0800
Subject: [PATCH] 1. gocator添加byte2/byte4的配置，目前测试byte4不成功，暂时还是使用byte2配置。 2. 添加键名代码映射配置和NG键名代码上传功能
---
src/Bro.M071.DBManager/ProductionMeasurementRecordsManager.cs | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/Bro.M071.DBManager/ProductionMeasurementRecordsManager.cs b/src/Bro.M071.DBManager/ProductionMeasurementRecordsManager.cs
index 0551fda..fa3f8f6 100644
--- a/src/Bro.M071.DBManager/ProductionMeasurementRecordsManager.cs
+++ b/src/Bro.M071.DBManager/ProductionMeasurementRecordsManager.cs
@@ -14,7 +14,7 @@
{
public class ProductionMeasurementRecordsManager : ModelManager<ProductionMeasurementRecords>
{
- DbProviderFactory Dbfactory = SQLiteFactory.Instance;
+ //DbProviderFactory Dbfactory = SQLiteFactory.Instance;
protected override void ActionBeforeNewModel(DBModel context, ProductionMeasurementRecords config)
{
CheckProductionCodeDuplicate(context, config);
@@ -29,23 +29,31 @@
{
}
- public List<ProductionMeasurementRecords> GetProductionMeasurementRecords()
+ public List<ProductionMeasurementRecords> GetProductionMeasurementRecords(ProductionMeasurementRecordsRequest request)
{
using (DBModel context = new DBModel())
{
- var list = context.ProductionMeasurementRecords.Where(u => u.IS_DELETED == 0);
+ var pList = context.ProductionMeasurementRecords.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);
+ }
- //if (!string.IsNullOrWhiteSpace(productionBatchNO))
- //{
- // list = list.Where(u => u.ProductionBatchNO.Contains(productionBatchNO));
- //}
- //if (!string.IsNullOrWhiteSpace(pid))
- //{
- // list = list.Where(u => u.PId.Contains(pid));
- //}
-
- var resultList = list.ToList();
- return resultList;
+ var pageList = pList.OrderBy(u => u.OperationStartTime).ToPagedList(request);
+ request.TotalNum = pList.Count();
+ return pageList;
}
}
--
Gitblit v1.8.0