M071.git - Gitblit

			@@ -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);
			@@ -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))
			{
			@@ -73,10 +73,18 @@
			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;
			}