工序接收查询修改

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("存在未完成审理单，请处理后再进行接收");
                 }

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 >

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);