涂装抛光流程变更

ZR.Model/MES/qc/DTO/QcCommonFqcDto.cs

@@ -219,11 +219,21 @@
         ///</summary>
         public int ProductQualifiedTotal { get; set; } = 0;
 
+        /// <summary>
+        /// 产线合格率
+        ///</summary>
+        public string ProductQualifiePassRate { get; set; } = "0%";
+
         /// <summary>
         /// 产线门把手合格数
         ///</summary>
         public int ProductDoorknobQualifiedTotal { get; set; } = 0;
 
+        /// <summary>
+        /// 产线倒车雷达合格数
+        ///</summary>
+        public int ProductParkingSensorbQualifiedTotal { get; set; } = 0;
+
         /// <summary>
         /// 产线抛光总数
         ///</summary>
@@ -259,6 +269,11 @@
         ///</summary>
         public int PolishDoorknobQualifiedTotal { get; set; } = 0;
 
+        /// <summary>
+        /// 抛光倒车雷达合格数
+        ///</summary>
+        public int PolishParkingSensorbQualifiedTotal { get; set; } = 0;
+
         /// <summary>
         /// 抛光打磨总数
         ///</summary>
@@ -284,6 +299,11 @@
         ///</summary>
         public int AfterPolishDoorknobQualifiedTotal { get; set; } = 0;
 
+        /// <summary>
+        /// 后道倒车雷达合格数
+        ///</summary>
+        public int AfterPolishParkingSensorbQualifiedTotal { get; set; } = 0;
+
         /// <summary>
         /// 后道检验抛光总数
         ///</summary>
@@ -314,11 +334,21 @@
         ///</summary>
         public int GP12QualifiedTotal { get; set; } = 0;
 
+        /// <summary>
+        /// GP12合格率
+        ///</summary>
+        public string GP12QualifiePassRate { get; set; } = "0%";
+
         /// <summary>
         /// 一次合格品GP12门把手数（需要清理）
         ///</summary>
         public int GP12DoorknobQualifiedTotal { get; set; } = 0;
 
+        /// <summary>
+        /// 一次合格品GP12倒车雷达
+        ///</summary>
+        public int GP12ParkingSensorQualifiedTotal { get; set; } = 0;
+
         /// <summary>
         /// 一次合格品GP12检验抛光总数
         ///</summary>
@@ -353,6 +383,21 @@
         ///</summary>
         public int FinishProductPackageOutTotal { get; set; } = 0;
 
+
+        /// ====== 二次统计数据 ======
+
+
+        /// <summary>
+        /// 总抛光合格数 =  GP12抛光合格数 + 后道抛光合格数
+        ///</summary>
+        public int StatisticsPolishQualifiedTotal { get; set; } = 0;
+
+        /// <summary>
+        /// 总合格数（二次合格数） = 总抛光合格数 + 产线合格数
+        ///</summary>
+        public int StatisticsProductAndPolishQualifiedTotal { get; set; } = 0;
+
+
         /// <summary>
         /// 备注
         /// </summary>

ZR.Model/MES/wms/Dto/WmGp12QualityStatisticsDto.cs

@@ -13,6 +13,8 @@ namespace ZR.Model.MES.wms.Dto
 
         public string Team { get; set; }
 
+        public int Type { get; set; } = -1;
+
         public string CreatedBy { get; set; }
 
         public DateTime? StartTime { get; set; }
@@ -59,6 +61,8 @@ namespace ZR.Model.MES.wms.Dto
 
         public bool IsReturnWorkpiece { get; set; }
 
+        public bool IsPolish { get; set; }
+
         public int? Type { get; set; }
 
         public string Remark { get; set; }

ZR.Model/MES/wms/Dto/WmPolishQualityStatisticsDto.cs

@@ -14,6 +14,8 @@ namespace ZR.Model.MES.wms.Dto
 
         public string Team { get; set; }
 
+        public int Type { get; set; } = -1;
+
         public string CreatedBy { get; set; }
 
         public DateTime? StartTime { get; set; }
@@ -131,6 +133,10 @@ namespace ZR.Model.MES.wms.Dto
 
         // 是否是返工件
         public bool IsReturnWorkpiece { get; set; } = false;
+        /// <summary>
+        /// 是否跳过GP12计算抛光合格数
+        /// </summary>
+        public bool IsOver { get; set; } = false;
 
     }
 }

ZR.Model/MES/wms/Dto/WmPolishWorkQualityStatisticsDto.cs

@@ -13,6 +13,7 @@ namespace ZR.Model.MES.wms.Dto
         public string Partnumber { get; set; }
 
         public string Team { get; set; }
+        public int Type { get; set; } = -1;
 
         public string CreatedBy { get; set; }
 
@@ -130,5 +131,10 @@ namespace ZR.Model.MES.wms.Dto
         // 是否是返工件
         public bool IsReturnWorkpiece { get; set; } = false;
 
+        /// <summary>
+        ///  是否跳过后道抛光直接出库
+        /// </summary>
+        public bool IsOutbound { get; set; } = false;
+
     }
 }

ZR.Model/MES/wms/WmGp12QualityStatistics.cs

@@ -84,7 +84,13 @@ namespace ZR.Model.MES.wms
         public bool IsReturnWorkpiece { get; set; }
 
         /// <summary>
-        /// 类别（0-默认 1-抛光 2-打磨 3-报废 4-合计） 
+        /// 是否是抛光品
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public bool IsPolish { get; set; }
+
+        /// <summary>
+        /// 类别（0-默认 1-抛光品） 
         /// </summary>
         public int? Type { get; set; }
 

ZR.Model/MES/wms/WmPolishQualityStatistics.cs

@@ -2,7 +2,7 @@
 namespace ZR.Model.MES.wms
 {
     /// <summary>
-    /// 抛光管理-质量统计
+    /// 抛光管理-质量统计(后道)
     /// </summary>
     [SugarTable("wm_polish_quality_statistics")]
     public class WmPolishQualityStatistics
@@ -78,7 +78,7 @@ namespace ZR.Model.MES.wms
         public DateTime? EndTime { get; set; }
 
         /// <summary>
-        /// 类别（0-默认 1-抛光 2-打磨 3-报废 4-合计） 
+        /// 类别（0-默认 1-跳过GP12直接计算抛光合格） 
         /// </summary>
         public int? Type { get; set; }
 
@@ -297,5 +297,11 @@ namespace ZR.Model.MES.wms
         [SugarColumn(ColumnName = "is_return_workpiece")]
         public bool IsReturnWorkpiece { get; set; } = false;
 
+        /// <summary>
+        /// 是否计算抛光合格数
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public bool IsOver { get; set; } = false;
+
     }
 }

ZR.Model/MES/wms/WmPolishWorkQualityStatistics.cs

@@ -291,5 +291,11 @@ namespace ZR.Model.MES.wms
         [SugarColumn(ColumnName = "is_return_workpiece")]
         public bool IsReturnWorkpiece { get; set; } = false;
 
+        /// <summary>
+        /// 是否抛光直接出库 
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public bool IsOutbound { get; set; } = false;
+
     }
 }