From c3510da29a7974c6af7ff3de1ade3db429d6f848 Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期三, 18 八月 2021 14:27:59 +0800 Subject: [PATCH] 申购管理申请履历显示所有历史单据,提交时如有无效试剂耗材报错 --- src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java index 68ddbb9..a9b6d0b 100644 --- a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java +++ b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java @@ -5,6 +5,7 @@ import com.nanometer.smartlab.entity.SysReagent; import com.nanometer.smartlab.entity.SysUser; import com.nanometer.smartlab.entity.enumtype.ApplyStatus; +import com.nanometer.smartlab.entity.enumtype.ValidFlag; import com.nanometer.smartlab.exception.BusinessException; import com.nanometer.smartlab.service.*; import com.nanometer.smartlab.util.Constants; @@ -630,11 +631,11 @@ String applyUserId = getUserId(); int count = 0; if (StringUtils.isNotBlank(applyUserId)) { - count = opeApplyService.getOpeApplyTotalCount(null, null, null, null, applyUserId, null, null,applyCode,null,(byte)0); + count = opeApplyService.getOpeApplyTotalCount(null, null, null, null, applyUserId, null, null,applyCode,null,(byte)1); } this.setRowCount(count); if (count > 0) { - list = opeApplyService.getOpeApplyList(null, null, null, null, applyUserId, null, null, first, pageSize,applyCode,null,(byte)0); + list = opeApplyService.getOpeApplyList(null, null, null, null, applyUserId, null, null, first, pageSize,applyCode,null,(byte)1); } selectedList = null; } catch (Exception e) { @@ -743,7 +744,17 @@ //申请一个申购编号 String applyCode = this.sysSequenceService.getApplyCode(); for (OpeApply opeApply : this.applyNewList) { - + if (opeApply.getReagent().getValidFlag() == null + ||opeApply.getReagent().getValidFlag().equals(ValidFlag.INVALID)){ + FacesUtils.warn(opeApply.getReagent().getName()+",该试剂已删除,请选择其他试剂"); + return; + } + if (opeApply.getReagent().getType() == 1 + && (opeApply.getReagent().getSupplierFlag() == null + || opeApply.getReagent().getSupplierFlag().equals(ValidFlag.INVALID))){ + FacesUtils.warn(opeApply.getReagent().getName()+",该试剂供应商已删除,请选择其他试剂"); + return; + } opeApply.setId(IDUtils.uuid()); opeApply.setApplyCode(applyCode); opeApply.setApplyUserId(applyUser.getId()); -- Gitblit v1.9.2