diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/ApplyServiceImpl.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/ApplyServiceImpl.java index 1d94bf8..614de0e 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/ApplyServiceImpl.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/ApplyServiceImpl.java @@ -209,18 +209,24 @@ public class ApplyServiceImpl extends BaseServiceImpl implem wrapper.eq(ApplyDetail::getApplyId, apply.getId()); // 条件查询申领相关物品信息 List details = applyDetailService.list(wrapper); - // 申领单修改状态 - for (ApplyDetail detail : details) { - // 如果归还时间不为null - if (detail.getReturnTime() != null) { - // 设置申领单状态为待归还(3) - apply.setStatus(3); - break; - } else { - // 反之,设置申领单状态为已完成(4) - apply.setStatus(4); + + if (details.size() == 0){//如果申领详情表中无数据,说明这个申领的详情数据可能被删掉了,但是由于申请通过之后就会减库存,所以直接将申请表设置为已完成就行了 + apply.setStatus(4); + }else{ + // 申领单修改状态 + for (ApplyDetail detail : details) { + // 如果归还时间不为null + if (detail.getReturnTime() != null) { + // 设置申领单状态为待归还(3) + apply.setStatus(3); + break; + } else { + // 反之,设置申领单状态为已完成(4) + apply.setStatus(4); + } } } + // 修改申领单 return this.updateById(apply); }