2

schangxiang@126.com

2024-06-22 b87302f2fc46913b73561f9f996bce3f33a48f1c

 iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs

@@ -108,7 +108,7 @@
                                               QualityDataInfoID = process.QualityDataInfoID,
                                               OperationType = process.OperationType,
                                               CreateUserName = process.CreatedUserName
                                           }).OrderBy(o => o.StartTime)
                                           }).OrderByDescending(o => o.StartTime)
             .ProjectToType<WorkPieceProcessOutput>()
              .ToADPagedListAsync(input.PageNo, input.PageSize);

@@ -206,7 +206,7 @@
                                                     EndTime = process.EndTime.ToString(),
                                                     //QualityState = process.QualityState,
                                                     CreateUserName = process.CreatedUserName
                                                 }).OrderBy(o => o.StartTime).Distinct()
                                                 }).OrderByDescending(o => o.StartTime).Distinct()
            .ProjectToType<WorkPieceProcessExcelOutput>()
             .ToListAsync();

@@ -296,6 +296,7 @@
                //StartTime = grouped.Key.StartTime,
                YieldCount = y.ToList().Count
            })
            .OrderBy(x => x.WorkingProcedureCurrent)
              .ToADPagedList(input.PageNo, input.PageSize);

            //var workPieceProcesss = await (from process in _workPieceProcessRep.DetachedEntities