From 97eb1b2a4f11ce60fda7a47ac1edfa588faf22eb Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 28 8月 2024 14:28:41 +0800
Subject: [PATCH] //单独处理 质量数据的状态
---
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs | 41 ++++++++---------------------------------
1 files changed, 8 insertions(+), 33 deletions(-)
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
index a5bd838..10079e9 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
+++ b/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,
@@ -108,7 +109,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 +207,7 @@
EndTime = process.EndTime.ToString(),
//QualityState = process.QualityState,
CreateUserName = process.CreatedUserName
- }).OrderBy(o => o.StartTime).Distinct()
+ }).OrderByDescending(o => o.StartTime).Distinct()
.ProjectToType<WorkPieceProcessExcelOutput>()
.ToListAsync();
@@ -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
{
@@ -296,37 +299,9 @@
//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
- // 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;
}
--
Gitblit v1.9.3