From dd8795a2675e32b25abe98f644f80d5f72fadb90 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Wed, 01 Nov 2023 14:08:55 +0800
Subject: [PATCH] update icon

---
 src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 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 c030f9d..66a8953 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java
@@ -3,7 +3,9 @@
 import com.nanometer.smartlab.entity.OpeApplyReserve;
 import com.nanometer.smartlab.entity.OpeUseFlow;
 import com.nanometer.smartlab.entity.OpeWarehouseReserve;
+import com.nanometer.smartlab.entity.dto.OpeUseFlowQueryDto;
 import com.nanometer.smartlab.entity.dto.PersonUseDetail;
+import com.nanometer.smartlab.model.CommonPage;
 
 import java.text.ParseException;
 import java.util.Date;
@@ -24,9 +26,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 +40,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);
 
@@ -59,4 +61,26 @@
     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;
+
+
+	/**
+	 * 分页获取流向
+	 * @param pageNum
+	 * @param pageSize
+	 * @param opeUseFlowQueryDto
+	 * @return
+	 */
+	CommonPage<OpeUseFlow> getOpeUseFlowSimpleInfoList(Integer pageNum, Integer pageSize, OpeUseFlowQueryDto opeUseFlowQueryDto);
 }

--
Gitblit v1.9.2