领胜LDS 键盘AOI检测项目
wells
2020-07-11 4bc5ee48e537d56190c943330f0093562912fb4f
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;
            }
        }