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/service/OpeUseFlowService.java | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java index 952b16d..2e97dae 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java @@ -24,9 +24,9 @@ int getOpeUseFlowTotalCount(String reagentId, String reagentCode, Integer status, String userId); List<OpeUseFlow> getOpeUseFlowListByName(String houseName,String reagentId, String reagentCode,String containerCode, Integer status, String userId, Date startDate,Date endDate, - Integer first, Integer pageSize); + Integer first, Integer pageSize,String operatestate); - int getOpeUseFlowTotalCountByName(String houseName, String reagentId, String reagentCode,String containerCode, Integer status, String userId, Date startDate,Date endDate); + int getOpeUseFlowTotalCountByName(String houseName, String reagentId, String reagentCode,String containerCode, Integer status, String userId, Date startDate,Date endDate,String operatestate); boolean update(OpeUseFlow opeUseFlow); @@ -56,4 +56,15 @@ int getApplyInfoSize(String receiptNumber); + int getOpeUseFlow(OpeUseFlow opeUseFlow); + + void scrapReagent(String reagentId,String reagentCode, String userId); + + OpeUseFlow selectById(String rowKey); + + OpeUseFlow selectByReceiptNumber(String receiptNumber,String userId); + + List<Map> selectAll(String houseName, String reagentId, String reagentCode, String containerCode, String userId, Date startDate, Date endDate); + + boolean export2Excel(List<Map> list) throws Exception; } -- Gitblit v1.9.2