From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Mon, 01 Jul 2024 10:58:35 +0800
Subject: [PATCH] change

---
 src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java
index 66a8953..4aa4904 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java
@@ -20,15 +20,17 @@
 
 	OpeUseFlow insertOpeUseFlow(OpeUseFlow opeUseFlow);
 
-	List<OpeUseFlow> getOpeUseFlowList(String reagentId, String reagentCode, Integer status, String userId,
+	int batchInsertOpeUseFlow(List<OpeUseFlow> opeUseFlowList);
+
+	List<OpeUseFlow> getOpeUseFlowList(Long reagentId, String reagentCode, Integer status, Long userId,
 			Integer first, Integer pageSize);
 
-	int getOpeUseFlowTotalCount(String reagentId, String reagentCode, Integer status, String userId);
+	int getOpeUseFlowTotalCount(Long reagentId, String reagentCode, Integer status, Long userId);
 
-	List<OpeUseFlow> getOpeUseFlowListByName(String houseName,String reagentId, String reagentCode,String containerCode, Integer status, String userId, Date startDate,Date endDate,
-			Integer first, Integer pageSize,String operatestate);
+	List<OpeUseFlow> getOpeUseFlowListByName(String houseName,Long reagentId, String reagentCode,String containerCode, Integer status, Long userId, Date startDate,Date endDate,
+			Integer first, Integer pageSize,Integer operatestate);
 
-	int getOpeUseFlowTotalCountByName(String houseName, String reagentId, String reagentCode,String containerCode, Integer status, String userId, Date startDate,Date endDate,String operatestate);
+	int getOpeUseFlowTotalCountByName(String houseName, Long reagentId, String reagentCode,String containerCode, Integer status, Long userId, Date startDate,Date endDate,Integer operatestate);
 
 	boolean update(OpeUseFlow opeUseFlow);
 
@@ -44,15 +46,15 @@
 
 	void updateReceiptNumberByCode(List<OpeApplyReserve> codeTmp,String receiptNumber,String note);
 
-	Map<String, Integer> getRegentInfoFromReceiptNumber(String receiptNumber);
+	Map<Long, Integer> getRegentInfoFromReceiptNumber(String receiptNumber);
 
-	Map<String,String>  getApplyUserByReagentCode(String reagentCode);
+	Map<String,Long>  getApplyUserByReagentCode(String reagentCode);
 
     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);
+	int getPersonalUseInfoCount(String reagentCode,Long 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,String applyPerson,String reagentName, int first, int pageSize);
+	List<OpeUseFlow> getPersonalUseInfoList(String reagentCode,Long userId, Date startTime, Date endTime, String receiptNumber, String department, String project,String applyPerson,String reagentName, int first, int pageSize);
 
     List<PersonUseDetail> getApplyInfo(String receiptNumber);
 
@@ -60,17 +62,17 @@
 
     int getOpeUseFlow(OpeUseFlow opeUseFlow);
 
-    void scrapReagent(String reagentId,String reagentCode, String userId);
+    void scrapReagent(Long reagentId,String reagentCode, Long userId);
 
     OpeUseFlow selectById(String rowKey);
 
-	OpeUseFlow selectByReceiptNumber(String receiptNumber,String userId);
+	OpeUseFlow selectByReceiptNumber(String receiptNumber,Long userId);
 
-    List<Map> selectAll(String houseName, String reagentId, String reagentCode, String containerCode, String userId, Date startDate, Date endDate);
+    List<Map> selectAll(String houseName, Long reagentId, String reagentCode, String containerCode, Long 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);
+	List<Map> selectExportDetail(String reagentCode, Long userId, Date startTime, Date endTime, String receiptNumber, String department, String project, String applyPerson, String reagentName);
 
 	boolean export22Excel(List<Map> list) throws Exception;
 
@@ -83,4 +85,14 @@
 	 * @return
 	 */
 	CommonPage<OpeUseFlow> getOpeUseFlowSimpleInfoList(Integer pageNum, Integer pageSize, OpeUseFlowQueryDto opeUseFlowQueryDto);
+
+
+	/**
+	 * 获取最新流向
+	 * @param reagentCode
+	 * @return
+	 */
+	OpeUseFlow getLastUseFlow(String reagentCode);
+
+
 }

--
Gitblit v1.9.2