1

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

@@ -264,6 +264,11 @@
         ///</summary>
         public int PolishQualifiedTotal { get; set; } = 0;
 
+        /// <summary>
+        /// 抛光合格率
+        ///</summary>
+        public string PolishQualifiePassRate { get; set; } = "0%";
+
         /// <summary>
         /// 抛光门把手合格总数
         ///</summary>
@@ -294,6 +299,11 @@
         ///</summary>
         public int AfterPolishQualifiedTotal { get; set; } = 0;
 
+        /// <summary>
+        /// 后道检验合格率
+        ///</summary>
+        public string AfterPolishQualifiePassRate { get; set; } = "0%";
+
         /// <summary>
         /// 后道检验门把手合格数
         ///</summary>

ZR.Service/mes/qc/CommonFQCService.cs

@@ -902,6 +902,18 @@ namespace ZR.Service.mes.qc
             boardData.AfterPolishQualifiedTotal =
                 boardData.AfterPolishQualifiedTotal
                 - boardData.AfterPolishParkingSensorbQualifiedTotal;
+            if (boardData.PolishRequireTotal > 0)
+            {
+                double passRate =
+                    ((double)boardData.PolishQualifiedTotal / boardData.PolishRequireTotal) * 100;
+                boardData.PolishQualifiePassRate = passRate.ToString("0") + "%";
+            }
+            if (boardData.AfterPolishRequireTotal > 0)
+            {
+                double passRate =
+                    ((double)boardData.AfterPolishQualifiedTotal / boardData.AfterPolishRequireTotal) * 100;
+                boardData.AfterPolishQualifiePassRate = passRate.ToString("0") + "%";
+            }
             return boardData;
         }