Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
赵正易
2024-11-07 18:39:46 +08:00
parent 3867d0fb18
commit 8155905cb4
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ZR.Service/mes/qc/CommonFQCService.cs
View File

@@ -1314,7 +1314,7 @@ namespace ZR.Service.mes.qc
var predicateParkingSensor = Expressionable
.Create<QcQualityStatisticsFirst>()
.And(it => ParkingSensorPartNumberList.Contains(it.FinishedPartNumber))
.And(it => it.FinishedPartNumber == query.Partnumber)
.AndIF(!string.IsNullOrEmpty(query.Partnumber), it => it.FinishedPartNumber == query.Partnumber)
.And(it => it.StartTime >= boardData.OneTimeStockTime)
.ToExpression();
// 倒车雷达
@@ -1483,7 +1483,7 @@ namespace ZR.Service.mes.qc
.Sum(it => it.Quantity) ?? 0;
// 产线倒车雷达
// 倒车雷达提取
// 倒车雷达剔除数据
string[] checkStrArray2 = { "倒车雷达" };
var ParkingSensorPartNumberCheck = Expressionable.Create<WmMaterial>();
foreach (string checkStr in checkStrArray2)
@@ -1497,41 +1497,41 @@ namespace ZR.Service.mes.qc
.Where(ParkingSensorPartNumberCheck.ToExpression())
.Select(it => it.Partnumber)
.ToList();
var predicateParkingSensor = Expressionable
/* var predicateParkingSensor = Expressionable
.Create<QcQualityStatisticsFirst>()
.And(it => ParkingSensorPartNumberList.Contains(it.FinishedPartNumber))
.And(it => it.FinishedPartNumber == partNumber)
.And(it => it.StartTime >= startTime.ToLocalTime())
.ToExpression();
// 倒车雷达
int productParkingSensorbQualifiedTotal =
Context
.Queryable<QcQualityStatisticsFirst>()
.Where(predicateParkingSensor)
.Sum(it => it.QualifiedNumber) ?? 0;
productParkingSensorbQualifiedTotal = productParkingSensorbQualifiedTotal / 3;
// 产线合格 - 倒车雷达
productParkingSensorbQualifiedTotal = productParkingSensorbQualifiedTotal / 3;*/
// 产线合格
int productQualifiedTotal =
Context
.Queryable<QcQualityStatisticsFirst>()
.Where(it => !ParkingSensorPartNumberList.Contains(it.FinishedPartNumber))
.Where(it => it.FinishedPartNumber == partNumber)
.Where(it => it.StartTime >= startTime.ToLocalTime())
.Sum(it => it.QualifiedNumber)
?? 0 - productParkingSensorbQualifiedTotal;
?? 0;
productQualifiedTotal = productQualifiedTotal / 3;
// 抛光合格
int polishQualifiedTotal =
Context
.Queryable<WmPolishWorkQualityStatistics>()
.Where(it => it.Partnumber == partNumber)
.Where(it => it.StartTime >= startTime.ToLocalTime())
.Where(it => it.StartTime.Value.ToLocalTime() >= startTime.ToLocalTime())
.Sum(it => it.QualifiedNumber) ?? 0;
// gp12投入
int gP12RequireTotal =
Context
.Queryable<WmGp12QualityStatistics>()
.Where(it => it.Partnumber == partNumber)
.Where(it => it.StartTime >= startTime.ToLocalTime())
.Where(it => it.StartTime.Value.ToLocalTime() >= startTime.ToLocalTime())
.Sum(it => it.RequireNumber) ?? 0;
// 后道直接出库
int afterPolishOutTotal =