2

schangxiang@126.com

2024-08-28 0240b3c4b808b93b88cb4f97f45d2475f6001429

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

@@ -94,7 +94,8 @@
                     && process.StartTime <= (input.StartTimeEndTime.HasValue ? input.StartTimeEndTime : DateTime.MaxValue)
                                           select new WorkPieceProcessOutput
                                           {

                                               QualityNoOk = process.QualityNoOk,
                                               QualityNoOkReason = process.QualityNoOkReason,
                                               Id = process.Id,
                                               WorkPieceID = process.WorkPieceID,
                                               EquipmentID = process.EquipmentID,
@@ -284,9 +285,11 @@
                                                //EquipmentID = process.EquipmentID,
                                                //EquipmentName = baseinfo2.EquipmentName,
                                                WorkingProcedureCurrent = process.WorkingProcedureCurrent,
                                                WorkPieceID = process.WorkPieceID,
                                                //StartTime = grouped.Key.StartTime,
                                                YieldCount = 0
                                            }).ToListAsync();
                                            }).Distinct().ToListAsync();


            var workPieceProcesss = workPieceProcesss2.GroupBy(x => new { x.WorkingProcedureCurrent }).Select(y => new QueryYieldOutput
            {
@@ -299,35 +302,6 @@
            .OrderBy(x => x.WorkingProcedureCurrent)
              .ToADPagedList(input.PageNo, input.PageSize);

            //var workPieceProcesss = await (from process in _workPieceProcessRep.DetachedEntities
            //                               join baseinfo in _equipmentBaseInfoRep.DetachedEntities on process.EquipmentID equals baseinfo.EquipmentId into joinedEmpty
            //                               from baseinfo2 in joinedEmpty.DefaultIfEmpty()
            //                               join workPiece in _workPieceInfoRep.DetachedEntities on process.WorkPieceID equals workPiece.WorkPieceID into joined2Empty
            //                               from workPiece2 in joined2Empty.DefaultIfEmpty()
            //                               where process.IsDeleted == false && process.WorkPieceID.Contains(string.IsNullOrEmpty(input.WorkPieceID) ? "" : input.WorkPieceID)
            //         && process.QualityState == (input.QualityState.HasValue ? input.QualityState.Value : process.QualityState)
            //         && process.EquipmentID == (string.IsNullOrEmpty(input.EquipmentID) ? process.EquipmentID : input.EquipmentID)
            //         && process.WorkingProcedureCurrent == (string.IsNullOrEmpty(input.WorkingProcedureCurrent) ? process.WorkingProcedureCurrent : input.WorkingProcedureCurrent)
            //         && workPiece2.OP80NewCode == (string.IsNullOrEmpty(input.OP80NewCode) ? workPiece2.OP80NewCode : input.OP80NewCode)
            //         && process.EquipmentID == (string.IsNullOrEmpty(input.EquipmentID) ? process.EquipmentID : input.EquipmentID)
            //         && process.OperationType == (string.IsNullOrEmpty(input.OperationType) ? process.OperationType : input.OperationType)
            //         && !string.IsNullOrEmpty(process.WorkPieceID)
            //         && process.StartTime >= (input.StartTimeBeginTime.HasValue ? input.StartTimeBeginTime : DateTime.MinValue)
            //         && process.StartTime <= (input.StartTimeEndTime.HasValue ? input.StartTimeEndTime : DateTime.MaxValue)
            //                               //group new { process, baseinfo2 } by new { process.WorkingProcedureCurrent, process.EquipmentID, baseinfo2.EquipmentName } into grouped
            //                               //group process by new { process.WorkingProcedureCurrent, process.EquipmentID } into grouped
            //                               group process by new { process.WorkingProcedureCurrent } into grouped
            //                               select new QueryYieldOutput
            //                               {
            //                                   // EquipmentID = grouped.Key.EquipmentID,
            //                                   //EquipmentName = grouped.Key.EquipmentName,
            //                                   WorkingProcedureCurrent = grouped.Key.WorkingProcedureCurrent,
            //                                   //StartTime = grouped.Key.StartTime,
            //                                   YieldCount = grouped.ToList().Count,

            //                               }).OrderBy(o => o.StartTime)
            // .ProjectToType<QueryYieldOutput>()
            //  .ToADPagedListAsync(input.PageNo, input.PageSize);

            return workPieceProcesss;
        }
@@ -382,7 +356,10 @@
               .Where(o => o.f.e.a.QualityState == (input.QualityState.HasValue ? input.QualityState.Value : o.f.e.a.QualityState))
               .Select(s => new WorkPieceInfoMachiningPageOutput
               {
                   QualityNoOk = s.f.e.a.QualityNoOk,
                   QualityNoOkReason = s.f.e.a.QualityNoOkReason,
                   Id = s.f.e.a.Id,

                   WorkPieceID = s.f.e.a.WorkPieceID,
                   WorkPieceState = s.f.e.a.WorkPieceState,
                   WorkPieceStateName = s.f.f.Value,