From a7a31882560e0156712dbf70a70894165a6dd281 Mon Sep 17 00:00:00 2001 From: "a15234804788@163.com" Date: Wed, 12 Oct 2022 17:48:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=89=A9=E5=93=81=E7=94=B3?= =?UTF-8?q?=E9=A2=86=E5=87=BA=E7=8E=B0=E7=94=B3=E9=A2=86=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E2=80=9C=E7=94=B3=E9=A2=86=E2=80=9D=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E4=B8=8D=E6=B6=88=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/service/impl/ApplyServiceImpl.java | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) 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); }