diff --git a/ZR.Model/MES/qc/DTO/QcCommonFqcDto.cs b/ZR.Model/MES/qc/DTO/QcCommonFqcDto.cs index 98664a5f..3f3ba490 100644 --- a/ZR.Model/MES/qc/DTO/QcCommonFqcDto.cs +++ b/ZR.Model/MES/qc/DTO/QcCommonFqcDto.cs @@ -264,6 +264,11 @@ /// public int PolishQualifiedTotal { get; set; } = 0; + /// + /// 抛光合格率 + /// + public string PolishQualifiePassRate { get; set; } = "0%"; + /// /// 抛光门把手合格总数 /// @@ -294,6 +299,11 @@ /// public int AfterPolishQualifiedTotal { get; set; } = 0; + /// + /// 后道检验合格率 + /// + public string AfterPolishQualifiePassRate { get; set; } = "0%"; + /// /// 后道检验门把手合格数 /// diff --git a/ZR.Service/mes/qc/CommonFQCService.cs b/ZR.Service/mes/qc/CommonFQCService.cs index 2ef59312..e0d53243 100644 --- a/ZR.Service/mes/qc/CommonFQCService.cs +++ b/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; }