From bfcc71f500625a26886b43c43a8fdf2ea1152844 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 23 六月 2026 13:47:59 +0800
Subject: [PATCH] 环境检测排序，仓库绑定物联设备
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index 4a44166..10b156c 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -585,6 +585,7 @@
AutoJudgeAllResponse response = new AutoJudgeAllResponse();
List<AutoJudgeAllResponse.ParamJudgeResult> paramResults = new ArrayList<>();
boolean hasRequiredUnqualified = false;
+ boolean hasNonRequiredUnqualified = false;
boolean allTextDescription = true;
boolean hasRequiredParam = false;
@@ -624,12 +625,17 @@
if (paramResult.getIsRequired() && Boolean.FALSE.equals(result.getQualified())) {
hasRequiredUnqualified = true;
}
+ // 妫�鏌ラ潪蹇呰鍒ゆ柇鍙傛暟鏄惁涓嶅悎鏍�
+ if (!paramResult.getIsRequired() && Boolean.FALSE.equals(result.getQualified())) {
+ hasNonRequiredUnqualified = true;
+ }
}
paramResults.add(paramResult);
}
response.setParamResults(paramResults);
response.setHasRequiredUnqualified(hasRequiredUnqualified);
+ response.setHasNonRequiredUnqualified(hasNonRequiredUnqualified);
response.setAllTextDescription(allTextDescription);
// 纭畾鏁翠綋鍒ゆ柇缁撴灉
@@ -637,6 +643,9 @@
response.setAutoJudgeResult(null);
} else if (hasRequiredUnqualified) {
response.setAutoJudgeResult("涓嶅悎鏍�");
+ } else if (hasNonRequiredUnqualified) {
+ // 蹇呰鍙傛暟閮藉悎鏍硷紝浣嗘湁闈炲繀瑕佸弬鏁颁笉鍚堟牸 鈫� 閮ㄥ垎鍚堟牸
+ response.setAutoJudgeResult("閮ㄥ垎鍚堟牸");
} else {
// 鎵�鏈夐渶瑕佽嚜鍔ㄥ垽鏂殑鍙傛暟椤归兘鍚堟牸锛屾暣浣撲负鍚堟牸
response.setAutoJudgeResult("鍚堟牸");
--
Gitblit v1.9.3