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

逻辑调整

Browse Source
This commit is contained in:
赵正易
2025-03-24 11:22:13 +08:00
parent 1037497795
commit e0ba4f60d2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ZR.Service/mes/wms/WmPolishRecordService.cs
View File

@@ -134,6 +134,7 @@ namespace ZR.Service.mes.wms
it => it.FinishedPartNumber == parm.Partnumber it => it.FinishedPartNumber == parm.Partnumber
) )
.Where(it => it.StartTime >= parm.StartTime && it.StartTime <= parm.EndTime) .Where(it => it.StartTime >= parm.StartTime && it.StartTime <= parm.EndTime)
.Where(it => it.PaoguangTotal > 0)
.ToList(); .ToList();
// 后道报表 根据日期范围 去取后道反抛光的数据 wm_polish_quality_statistics // 后道报表 根据日期范围 去取后道反抛光的数据 wm_polish_quality_statistics
@@ -144,6 +145,7 @@ namespace ZR.Service.mes.wms
it => it.Partnumber == parm.Partnumber it => it.Partnumber == parm.Partnumber
) )
.Where(it => it.StartTime >= parm.StartTime && it.StartTime <= parm.EndTime) .Where(it => it.StartTime >= parm.StartTime && it.StartTime <= parm.EndTime)
.Where(it => it.PaoguangTotal > 0)
.ToList(); .ToList();
// GP12报表 根据日期范围 去取gp12反抛光的数据 qc_gp12_service_statistics GP12(new) wm_gp12_quality_statistics(old) // GP12报表 根据日期范围 去取gp12反抛光的数据 qc_gp12_service_statistics GP12(new) wm_gp12_quality_statistics(old)
@@ -155,6 +157,7 @@ namespace ZR.Service.mes.wms
) )
.Where(it => it.StartTime >= parm.StartTime && it.StartTime <= parm.EndTime) .Where(it => it.StartTime >= parm.StartTime && it.StartTime <= parm.EndTime)
.Where(it => it.GroupSort == 1) .Where(it => it.GroupSort == 1)
.Where(it => it.PolishNumber > 0)
.ToList(); .ToList();
//qcGp12ServiceStatistics = qcGp12ServiceStatistics.DistinctBy(o => o.PartNumber).ToList(); //qcGp12ServiceStatistics = qcGp12ServiceStatistics.DistinctBy(o => o.PartNumber).ToList();
@@ -165,6 +168,7 @@ namespace ZR.Service.mes.wms
it => it.Partnumber == parm.Partnumber it => it.Partnumber == parm.Partnumber
) )
.Where(it => it.StartTime >= parm.StartTime && it.StartTime <= parm.EndTime) .Where(it => it.StartTime >= parm.StartTime && it.StartTime <= parm.EndTime)
.Where(it => it.PaoguangTotal > 0)
.ToList(); .ToList();
//二出（同一张表）wm_polish_work_quality_statistics 根据日期范围 去取抛光操作出库的数据 //二出（同一张表）wm_polish_work_quality_statistics 根据日期范围 去取抛光操作出库的数据
@@ -178,8 +182,8 @@ namespace ZR.Service.mes.wms
.ToList(); .ToList();
#endregion #endregion
//int totalcount = qcQualityStatisticsFirsts.Count + wmPolishQualityStatistics.Count + qcGp12ServiceStatistics.Count + wmGp12QualityStatistics.Count int totalcount = qcQualityStatisticsFirsts.Count + wmPolishQualityStatistics.Count + qcGp12ServiceStatistics.Count + wmGp12QualityStatistics.Count
// + wmPolishWorkQualityStatistics.Count; + wmPolishWorkQualityStatistics.Count;
#region 组装 WmPolishRecord 实体 #region 组装 WmPolishRecord 实体
// 组装 WmPolishRecord 实体 // 组装 WmPolishRecord 实体