From ff8009715f9424c1ed3f44ee75366b92ca36d443 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 01 7月 2024 17:04:27 +0800
Subject: [PATCH] 22
---
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs | 33 +++------------------------------
1 files changed, 3 insertions(+), 30 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 bf155ef..deb9131 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
@@ -284,9 +284,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 +301,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;
}
--
Gitblit v1.9.3