From 1eeae82f74cbb3469ad8931e45b6fc77a945b912 Mon Sep 17 00:00:00 2001 From: kongzy <kongzy> Date: 星期一, 23 十月 2023 16:10:08 +0800 Subject: [PATCH] 姑苏实验室去除价格确认过程 --- src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java index 9a32592..a543c22 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); @@ -38,15 +38,15 @@ OpeUseFlow getOpeUseFlowByCode(String reagentCode); - void updateReceiptNumber(String code, String receiptNumber); + void updateReceiptNumber(String code, String receiptNumber,String note); - void updateReceiptNumberByCode(List<OpeApplyReserve> codeTmp,String receiptNumber); + void updateReceiptNumberByCode(List<OpeApplyReserve> codeTmp,String receiptNumber,String note); Map<String, Integer> getRegentInfoFromReceiptNumber(String receiptNumber); Map<String,String> getApplyUserByReagentCode(String reagentCode); - void updateReceiptNumberByCode2(List<OpeWarehouseReserve> codeTmp, String receiptNumber); + void updateReceiptNumberByCode2(List<OpeWarehouseReserve> codeTmp, String receiptNumber,String note); int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project,String applyPerson,String reagentName); @@ -57,4 +57,18 @@ 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; + + List<Map> selectExportDetail(String reagentCode, String userId, Date startTime, Date endTime, String receiptNumber, String department, String project, String applyPerson, String reagentName); + + boolean export22Excel(List<Map> list) throws Exception; } -- Gitblit v1.9.2