From e0ba4f60d28617b206e532a2de97e1bdc1c748aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Mon, 24 Mar 2025 11:22:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Service/mes/wms/WmPolishRecordService.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ZR.Service/mes/wms/WmPolishRecordService.cs b/ZR.Service/mes/wms/WmPolishRecordService.cs index 99cc5b47..abc1b522 100644 --- a/ZR.Service/mes/wms/WmPolishRecordService.cs +++ b/ZR.Service/mes/wms/WmPolishRecordService.cs @@ -134,6 +134,7 @@ namespace ZR.Service.mes.wms it => it.FinishedPartNumber == parm.Partnumber ) .Where(it => it.StartTime >= parm.StartTime && it.StartTime <= parm.EndTime) + .Where(it => it.PaoguangTotal > 0) .ToList(); // 后道报表 根据日期范围 去取后道反抛光的数据 wm_polish_quality_statistics @@ -144,6 +145,7 @@ namespace ZR.Service.mes.wms it => it.Partnumber == parm.Partnumber ) .Where(it => it.StartTime >= parm.StartTime && it.StartTime <= parm.EndTime) + .Where(it => it.PaoguangTotal > 0) .ToList(); // 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.GroupSort == 1) + .Where(it => it.PolishNumber > 0) .ToList(); //qcGp12ServiceStatistics = qcGp12ServiceStatistics.DistinctBy(o => o.PartNumber).ToList(); @@ -165,6 +168,7 @@ namespace ZR.Service.mes.wms it => it.Partnumber == parm.Partnumber ) .Where(it => it.StartTime >= parm.StartTime && it.StartTime <= parm.EndTime) + .Where(it => it.PaoguangTotal > 0) .ToList(); //二出（同一张表）wm_polish_work_quality_statistics 根据日期范围 去取抛光操作出库的数据 @@ -178,8 +182,8 @@ namespace ZR.Service.mes.wms .ToList(); #endregion - //int totalcount = qcQualityStatisticsFirsts.Count + wmPolishQualityStatistics.Count + qcGp12ServiceStatistics.Count + wmGp12QualityStatistics.Count - // + wmPolishWorkQualityStatistics.Count; + int totalcount = qcQualityStatisticsFirsts.Count + wmPolishQualityStatistics.Count + qcGp12ServiceStatistics.Count + wmGp12QualityStatistics.Count + + wmPolishWorkQualityStatistics.Count; #region 组装 WmPolishRecord 实体 // 组装 WmPolishRecord 实体