From fe59eb7ea9e69a14f5a7b7ddabd244f2dc134788 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Fri, 22 Oct 2021 18:34:32 +0800
Subject: [PATCH] 领用添加备注，个人领用页面查看

---
 src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java
index 042e7d1..aeca979 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,20 +38,33 @@
 
 	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);
+	int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project,String applyPerson,String reagentName);
 
-	List<OpeUseFlow> getPersonalUseInfoList(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project, int first, int pageSize);
+	List<OpeUseFlow> getPersonalUseInfoList(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project,String applyPerson,String reagentName, int first, int pageSize);
 
     List<PersonUseDetail> getApplyInfo(String receiptNumber);
 
+	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