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 checkByWpId = inspectionTaskMapper.selectList(Wrappers.lambdaQuery(InspectionTask.class).eq(InspectionTask::getWpId, frontWorkPlan.getId())); + if (CollectionUtils.isNotEmpty(checkByWpId)) { // 查询是否存在未完的审理单 - List rsLst = reviewSheetService.getNoCompleteByWcId(checkByWpId.getId()); + List 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 { * @Author dxl * @CreateTime 2023/9/19 14:06 */ - List getNoCompleteByWcId(Long wcId); + List getNoCompleteByWcId(List wcId); /** *

方法描述: 根据车间作业计划查询超过三小时未审完的审理单

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 getNoCompleteByWcId(Long wcId) { - if (IdUtil.isInvalid(wcId)) { + public List getNoCompleteByWcId(List wcId) { + if (CollectionUtils.isEmpty(wcId)) { return null; } LambdaQueryWrapper 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);