From 5bd525ed7117d1678bab6cb6f281fb8e71ea8e08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Wed, 24 Jun 2026 17:17:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=8E=A5=E6=94=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/produce/service/impl/WorkOrderServiceImpl.java     | 6 +++---
 .../desk/quality/service/IReviewSheetService.java           | 2 +-
 .../desk/quality/service/impl/ReviewSheetServiceImpl.java   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
index 248a2adb7..3b400704d 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
@@ -1913,10 +1913,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         // 上序不为空时进行审理单验证
         if (frontWorkPlan != null) {
             // 验证上序是否存在未完成审理，如果存在则不允许接收
-            InspectionTask checkByWpId = inspectionTaskMapper.selectOne(Wrappers.lambdaQuery(InspectionTask.class).eq(InspectionTask::getWpId, frontWorkPlan.getId()));
-            if (checkByWpId != null) {
+            List<InspectionTask> checkByWpId = inspectionTaskMapper.selectList(Wrappers.lambdaQuery(InspectionTask.class).eq(InspectionTask::getWpId, frontWorkPlan.getId()));
+            if (CollectionUtils.isNotEmpty(checkByWpId)) {
                 // 查询是否存在未完的审理单
-                List<ReviewSheet> rsLst = reviewSheetService.getNoCompleteByWcId(checkByWpId.getId());
+                List<ReviewSheet> rsLst = reviewSheetService.getNoCompleteByWcId(checkByWpId.stream().map(InspectionTask::getId).collect(Collectors.toList()));
                 if (CollectionUtils.isNotEmpty(rsLst)) {
                     throw new ServiceException("存在未完成审理单，请处理后再进行接收");
                 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java
index c1b3ed4ce..59bbc9a80 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java
@@ -72,7 +72,7 @@ public interface IReviewSheetService extends EnBaseService<ReviewSheet> {
      * @Author dxl
      * @CreateTime 2023/9/19 14:06
      */
-    List<ReviewSheet> getNoCompleteByWcId(Long wcId);
+    List<ReviewSheet> getNoCompleteByWcId(List<Long> wcId);
 
     /**
      * <p>方法描述: 根据车间作业计划查询超过三小时未审完的审理单 </p >
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java
index f3bc9c8b8..4cc495769 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java
@@ -272,12 +272,12 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
     }
 
     @Override
-    public List<ReviewSheet> getNoCompleteByWcId(Long wcId) {
-        if (IdUtil.isInvalid(wcId)) {
+    public List<ReviewSheet> getNoCompleteByWcId(List<Long> wcId) {
+        if (CollectionUtils.isEmpty(wcId)) {
             return null;
         }
         LambdaQueryWrapper<ReviewSheet> qw = Wrappers.lambdaQuery();
-        qw.eq(ReviewSheet::getWcId, wcId);
+        qw.in(ReviewSheet::getWcId, wcId);
         qw.in(ReviewSheet::getStatus, ReviewSheetConst.STATUS.S_NEW, ReviewSheetConst.STATUS.S_HEAR);
         qw.orderByAsc(ReviewSheet::getRsCode);
         return baseMapper.selectList(qw);