Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

分页查询缺陷统计

Browse Source
This commit is contained in:
qianhao.xu
2024-12-27 16:40:12 +08:00
parent 3449390800
commit 17ba645e2c
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DOAN.Model/MES/Quality/FQC/Dto/QueryFQCShowDto.cs
View File

@@ -34,7 +34,7 @@ namespace DOAN.Model.MES.Quality.FQC.Dto
}
public class ResultFQCShowDto
public class ResultFQCShowDto
{
/// <summary>
/// 工单号（一旦确定，不可更改）
@@ -58,7 +58,7 @@ namespace DOAN.Model.MES.Quality.FQC.Dto
/// 派发数量
/// </summary>
public int? DispatchNum { get; set; }
public int? PlanNum { get; set; }
/// <summary>
/// 完成数量
@@ -80,7 +80,7 @@ namespace DOAN.Model.MES.Quality.FQC.Dto
/// <summary>
/// 缺陷详情
/// </summary>
public Dictionary<string,int> DefectDetailDictionary { get; set; }
// public Dictionary<string,int> DefectDetailDictionary { get; set; }
}

19
DOAN.Service/MES/Quality/FQC/QcFinishedproductDefectService.cs
View File

@@ -130,10 +130,21 @@ namespace DOAN.Service.MES.quality.FQC
.AndIF(queryFQCShow.SearchDateTime != null && queryFQCShow.SearchDateTime.Length >= 2 && queryFQCShow.SearchDateTime[0] > DateTime.MinValue, (t1, t2, t3) => t3.CheckDatetime > queryFQCShow.SearchDateTime[0])
.AndIF(queryFQCShow.SearchDateTime != null && queryFQCShow.SearchDateTime.Length >= 2 && queryFQCShow.SearchDateTime[1] > DateTime.MinValue, (t1, t2, t3) => t3.CheckDatetime > queryFQCShow.SearchDateTime[1]);
Context.Queryable<ProWorkorder>().RightJoin<ProReportwork01>((t1,t2)=>t1.Workorder==t2.Workorder)
.RightJoin<QcFinishedproductDefectCollection>((t1,t2,t3)=>
return Context.Queryable<ProWorkorder>()
.RightJoin<ProReportwork01>((t1, t2) => t1.Workorder == t2.Workorder)
.RightJoin<QcFinishedproductDefectCollection>((t1, t2, t3) => t2.Workorder == t3.Workorder)
.Where(predicate.ToExpression())
.GroupBy((t1,t2,t3)=>new { t3.Workorder, t1.productionName, t1.productionCode, t2.PlanNum, t2.FinishNum })
.Select((t1, t2, t3) => new ResultFQCShowDto
{
Workorder = t3.Workorder,
productionName = t1.productionName,
productionCode = t1.productionCode,
PlanNum = t2.PlanNum,
FinishedNum = t2.FinishNum,
DefectAllNum = SqlFunc.AggregateSum(t3.Number),
QualifiedNum = t2.FinishNum- SqlFunc.AggregateSum(t3.Number)
}).ToPage_NO_Convert(queryFQCShow);
}