From 743b74dfa59b05cb4bafe8678d8a6223a283ad03 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 29 六月 2026 02:18:42 +0800
Subject: [PATCH] fix: 质检合格率有误
---
src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java
index fdc2088..1acf1d6 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java
@@ -52,28 +52,25 @@
if (qi.getInspectState() != null && qi.getInspectState() == 1) {
dto.setCompletedCount(dto.getCompletedCount().add(qty));
- BigDecimal qualified = BigDecimal.ZERO;
- BigDecimal unqualified = BigDecimal.ZERO;
+ BigDecimal qualified;
+ BigDecimal unqualified;
String result = qi.getCheckResult();
- BigDecimal qiQualified = qi.getQualifiedQuantity() != null ? qi.getQualifiedQuantity() : BigDecimal.ZERO;
- BigDecimal qiUnqualified = qi.getUnqualifiedQuantity() != null ? qi.getUnqualifiedQuantity() : BigDecimal.ZERO;
- if ("鍚堟牸".equals(result)) {
+ if (qi.getQualifiedQuantity() != null) {
+ qualified = qi.getQualifiedQuantity();
+ } else if ("鍚堟牸".equals(result)) {
qualified = qty;
- } else if ("涓嶅悎鏍�".equals(result)) {
- unqualified = qty;
- } else if ("閮ㄥ垎鍚堟牸".equals(result)) {
- if (qiUnqualified.compareTo(BigDecimal.ZERO) > 0) {
- qualified = qty.subtract(qiUnqualified);
- unqualified = qiUnqualified;
- } else {
- qualified = qiQualified;
- unqualified = qty.subtract(qiQualified);
- }
} else {
- qualified = qiQualified;
- unqualified = qiUnqualified;
+ qualified = BigDecimal.ZERO;
+ }
+
+ if (qi.getUnqualifiedQuantity() != null) {
+ unqualified = qi.getUnqualifiedQuantity();
+ } else if ("涓嶅悎鏍�".equals(result) || "閮ㄥ垎鍚堟牸".equals(result)) {
+ unqualified = qty;
+ } else {
+ unqualified = BigDecimal.ZERO;
}
dto.setQualifiedCount(dto.getQualifiedCount().add(qualified));
--
Gitblit v1.9.3