质量统计完成

ZR.Service/mes/op/OperationService.cs

@@ -71,7 +71,16 @@ namespace ZR.Service.MES.op
 
             return OpStatisticsDTOList;
         }
-
+        /// <summary>
+        /// 质量统计分析表和工单关联一下 
+        /// </summary>
+        /// <param name="workorderid"></param>
+        /// <param name="pageNum"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="year"></param>
+        /// <param name="week"></param>
+        /// <param name="date"></param>
+        /// <returns></returns>
         public (List<QcFqcDTO>,int) GueryQualityStatistics(string workorderid ,int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
         {
             var predicate = Expressionable.Create<QcFqcDTO>()
@@ -79,6 +88,8 @@ namespace ZR.Service.MES.op
              .AndIF(week > 0, p => p.Week == week)
              .AndIF(date > 0, p => p.Date == date)
              .ToExpression();
+
+
             var predicate2 = Expressionable.Create<QcFqc>()
                 .AndIF(!string.IsNullOrEmpty(workorderid),q=>q.FkWorkorderId== workorderid)
                 .ToExpression();
@@ -109,6 +120,11 @@ namespace ZR.Service.MES.op
                              QualifiedNum03 = q.QualifiedNum03,
                              PolishNum03 = q.PolishNum03,
                              ScrapNum03 = q.ScrapNum03,
+                             FirstgoodNum=q.FirstgoodNum,
+                             FirstgoodRate=q.FirstgoodRate,
+                             FinalgoodRate=q.FinalgoodRate,
+                             FinalgoodNum=q.FinalgoodNum,
+
                          }).MergeTable();
 
             List<QcFqcDTO> QcFqcDTOList = query5.Where(predicate).ToPageList(pageNum, pageSize,ref totalCount);