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-18 20:13:49 +08:00
parent caee66b131
commit 15bc3b22fb
7 changed files with 295 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1314,7 +1314,10 @@ namespace ZR.Service.mes.qc
var predicateParkingSensor = Expressionable
.Create<QcQualityStatisticsFirst>()
.And(it => ParkingSensorPartNumberList.Contains(it.FinishedPartNumber))
.AndIF(!string.IsNullOrEmpty(query.Partnumber), it => it.FinishedPartNumber == query.Partnumber)
.AndIF(
!string.IsNullOrEmpty(query.Partnumber),
it => it.FinishedPartNumber == query.Partnumber
)
.And(it => it.StartTime >= boardData.OneTimeStockTime)
.ToExpression();
// 倒车雷达
@@ -1408,6 +1411,12 @@ namespace ZR.Service.mes.qc
{
foreach (var partNumber in partNumbers)
{
startTime =
Context
.Queryable<WmPolishInventory>()
.Where(it => it.Partnumber == partNumber)
.Select(it => it.UpdatedTime)
.First() ?? startTime;
// 盘点数
int polishWarehouseTotal =
Context
@@ -1475,6 +1484,12 @@ namespace ZR.Service.mes.qc
{
foreach (var partNumber in partNumbers)
{
startTime =
Context
.Queryable<WmOneTimeInventory>()
.Where(it => it.Partnumber == partNumber)
.Select(it => it.UpdatedTime)
.First() ?? startTime;
// 基本值
int oneTimeWarehouseTotal =
Context
@@ -1497,27 +1512,28 @@ namespace ZR.Service.mes.qc
.Where(ParkingSensorPartNumberCheck.ToExpression())
.Select(it => it.Partnumber)
.ToList();
/* 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;*/
/* 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;*/
// 产线合格
int productQualifiedTotal =
Context
.Queryable<QcQualityStatisticsFirst>()
.Where(it => !ParkingSensorPartNumberList.Contains(it.FinishedPartNumber))
.Where(it =>
!ParkingSensorPartNumberList.Contains(it.FinishedPartNumber)
)
.Where(it => it.FinishedPartNumber == partNumber)
.Where(it => it.StartTime >= startTime)
.Sum(it => it.QualifiedNumber)
?? 0;
.Sum(it => it.QualifiedNumber) ?? 0;
productQualifiedTotal = productQualifiedTotal / 3;
// 抛光合格
int polishQualifiedTotal =