合格

ZR.Model/MES/qc/DTO/qualificationRateReport/QualificationRateEchartsDTO.cs

@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZR.Model.MES.qc.DTO.qualificationRateReport
+{
+    public class QualificationRateEchartsDTO
+    {
+        /// <summary>
+        /// 序号 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 零件号 
+        /// </summary>
+        public string PartNumber { get; set; }
+
+        /// <summary>
+        /// 零件描述 
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// 总投入数 
+        /// </summary>
+        public int? AllRequireNumber { get; set; }
+
+        /// <summary>
+        /// 总合格数 
+        /// </summary>
+        public int? AllQualifiedNumber { get; set; }
+
+        /// <summary>
+        /// 总合格率 
+        /// </summary>
+        public decimal QualifiedRate { get; set; }
+
+        /// <summary>
+        /// 下线投入数 
+        /// </summary>
+        public int? FirstRequireNumber { get; set; }
+
+        /// <summary>
+        /// 下线合格数 
+        /// </summary>
+        public int? FirstQualifiedNumber { get; set; }
+
+        /// <summary>
+        /// 下线合格率 
+        /// </summary>
+        public decimal FirstQualifiedRate { get; set; }
+
+        /// <summary>
+        /// GP12投入数 
+        /// </summary>
+        public int? GP12RequireNumber { get; set; }
+
+        /// <summary>
+        /// GP12合格数 
+        /// </summary>
+        public int? GP12QualifiedNumber { get; set; }
+
+        /// <summary>
+        /// GP12合格率 
+        /// </summary>
+        public decimal GP12QualifiedRate { get; set; }
+
+        /// <summary>
+        /// 后道投入数 
+        /// </summary>
+        public int? PolishRequireNumber { get; set; }
+
+        /// <summary>
+        /// 后道合格数 
+        /// </summary>
+        public int? PolishQualifiedNumber { get; set; }
+
+        /// <summary>
+        /// 后道合格率 
+        /// </summary>
+        public decimal PolishQualifiedRate { get; set; }
+
+        /// <summary>
+        /// 开始时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "start_time")]
+        public DateTime? StartTime { get; set; }
+
+        /// <summary>
+        /// 结束时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "end_time")]
+        public DateTime? EndTime { get; set; }
+    }
+}

ZR.Model/MES/qc/DTO/qualificationRateReport/QualificationRateReportDTO.cs

@@ -1,7 +1,11 @@
-namespace ZR.Model.MES.DTO
-{
+using ZR.Model.MES.wms;
 
-    public class QualificationRateReportQueryDTO
+namespace ZR.Model.MES.DTO
+{
+    /// <summary>
+    /// 质量统计查询条件
+    ///</summary>
+    public class QualificationRateReportQueryDTO : PagerInfo
     {
         /// <summary>
         /// 零件号 
@@ -21,7 +25,7 @@
         public DateTime? EndTime { get; set; }
     }
 
-    public class QualificationRateReportDTO
+    public class QualificationRateReportDTO : PagerInfo
     {
         /// <summary>
         /// 序号 
@@ -29,11 +33,6 @@
         [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
         public string Id { get; set; }
 
-        /// <summary>
-        /// 工单号 
-        /// </summary>
-        public string WorkOrder { get; set; }
-
         /// <summary>
         /// 零件号 
         /// </summary>
@@ -55,115 +54,77 @@
         public string Color { get; set; }
 
         /// <summary>
-        /// 班组 
+        /// 总投入数 
         /// </summary>
-        public string Team { get; set; }
+        public int? AllRequireNumber { get; set; }
 
         /// <summary>
-        /// 站点号 
+        /// 总合格数 
         /// </summary>
-        public string SiteNo { get; set; }
+        public int? AllQualifiedNumber { get; set; }
 
         /// <summary>
-        /// 串口号 
+        /// 总合格率 
         /// </summary>
-        public string ComNo { get; set; }
+        public string QualifiedRate { get; set; }
 
         /// <summary>
-        /// 是否一次合格 
+        /// 下线投入数 
         /// </summary>
-        public int? IsOnetime { get; set; }
+        public int? FirstRequireNumber { get; set; }
 
         /// <summary>
-        /// 是否返工件 
+        /// 下线合格数 
         /// </summary>
-        public int? IsBack { get; set; }
+        public int? FirstQualifiedNumber { get; set; }
 
         /// <summary>
-        /// 是否抛光件 
+        /// 下线合格率 
         /// </summary>
-        public int? IsPolish { get; set; }
+        public string FirstQualifiedRate { get; set; }
 
         /// <summary>
-        /// 是否外部件 
+        /// GP12投入数 
         /// </summary>
-        public int? IsOut { get; set; }
+        public int? GP12RequireNumber { get; set; }
+
+        /// <summary>
+        /// GP12合格数 
+        /// </summary>
+        public int? GP12QualifiedNumber { get; set; }
+
+        /// <summary>
+        /// GP12合格率 
+        /// </summary>
+        public string GP12QualifiedRate { get; set; }
+
+        /// <summary>
+        /// 后道投入数 
+        /// </summary>
+        public int? PolishRequireNumber { get; set; }
+
+        /// <summary>
+        /// 后道合格数 
+        /// </summary>
+        public int? PolishQualifiedNumber { get; set; }
+
+        /// <summary>
+        /// 后道合格率 
+        /// </summary>
+        public string PolishQualifiedRate { get; set; }
 
         /// <summary>
         /// 开始时间 
         /// </summary>
+        [SugarColumn(ColumnName = "start_time")]
         public DateTime? StartTime { get; set; }
 
         /// <summary>
         /// 结束时间 
         /// </summary>
+        [SugarColumn(ColumnName = "end_time")]
         public DateTime? EndTime { get; set; }
 
-        /// <summary>
-        /// 箱标签记录 
-        /// </summary>
-        public string Label { get; set; }
-
-        /// <summary>
-        /// 投入数 
-        /// </summary>
-        public int? RequireNumber { get; set; }
-
-        /// <summary>
-        /// 合格数 
-        /// </summary>
-        public int? QualifiedNumber { get; set; }
-
-        /// <summary>
-        /// 合格率 
-        /// </summary>
-        public string QualifiedRate { get; set; }
-
-        /// <summary>
-        /// 抛光数 
-        /// </summary>
-        public int? PolishNumber { get; set; }
-
-        /// <summary>
-        /// 打磨数 
-        /// </summary>
-        public int? DamoNumber { get; set; }
-
-        /// <summary>
-        /// 报废数 
-        /// </summary>
-        public int? BaofeiNumber { get; set; }
-
-        /// <summary>
-        /// 同组标识 
-        /// </summary>
-        public string GroupCode { get; set; }
-
-        /// <summary>
-        /// 同组顺序 
-        /// </summary>
-        public int? GroupSort { get; set; }
-
-        /// <summary>
-        /// 同组缺陷记录 
-        /// </summary>
-        public string GroupDefectJson { get; set; }
-
-        /// <summary>
-        /// 系统类别 
-        /// </summary>
-        public string Type { get; set; }
-
-        /// <summary>
-        /// 系统状态 
-        /// </summary>
-        public string Status { get; set; }
-
-        /// <summary>
-        /// 系统备注 
-        /// </summary>
-        public string Remark { get; set; }
-
         /// <summary>
         /// 创建人 
         /// </summary>