Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

xcd

2020-07-14 12200ec69e33881649974f31f270750ba6b15e1d

 src/Bro.M071.DBManager/MeasurementUnitResultManager.cs

@@ -29,7 +29,7 @@
        {
        }

        public List<MeasurementUnitResult_DTO> GetMeasurementUnitResult(MeasurementUnitResultRequest request)
        public List<MeasurementUnitResult> GetMeasurementUnitResult(MeasurementUnitResultRequest request)
        {
            using (DBModel context = new DBModel())
            {
@@ -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))
                {
@@ -70,11 +70,10 @@
                            join measurementUnitResult in mList
                            on productionMeasurementRecords.ID equals measurementUnitResult.ProductionMeasurementRecordsId
                            //into pmList
                            select new MeasurementUnitResult_DTO
                            select new MeasurementUnitResult
                            {
                                ProductionCode = productionMeasurementRecords.ProductionCode,
                                ProductionBarcode = productionMeasurementRecords.ProductionBarcode

                            };
                var pageList = query.OrderBy(u => u.CREATE_TIME).ToPagedList(request);
                request.TotalNum = mList.Count();