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 |   40 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java
index cf00951..2e97dae 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java
@@ -1,6 +1,9 @@
 package com.nanometer.smartlab.service;
 
+import com.nanometer.smartlab.entity.OpeApplyReserve;
 import com.nanometer.smartlab.entity.OpeUseFlow;
+import com.nanometer.smartlab.entity.OpeWarehouseReserve;
+import com.nanometer.smartlab.entity.dto.PersonUseDetail;
 
 import java.text.ParseException;
 import java.util.Date;
@@ -20,10 +23,10 @@
 
 	int getOpeUseFlowTotalCount(String reagentId, String reagentCode, Integer status, String userId);
 
-	List<OpeUseFlow> getOpeUseFlowListByName(String houseName,String reagentId, String reagentCode, Integer status, String userId, Date startDate,Date endDate,
-			Integer first, Integer pageSize);
+	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);
 
-	int getOpeUseFlowTotalCountByName(String houseName, String reagentId, String reagentCode, 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);
 
@@ -33,4 +36,35 @@
 
 	void updateTimeByCode(String code);
 
+	OpeUseFlow getOpeUseFlowByCode(String reagentCode);
+
+    void updateReceiptNumber(String code, String receiptNumber);
+
+	void updateReceiptNumberByCode(List<OpeApplyReserve> codeTmp,String receiptNumber);
+
+	Map<String, Integer> getRegentInfoFromReceiptNumber(String receiptNumber);
+
+	Map<String,String>  getApplyUserByReagentCode(String reagentCode);
+
+    void updateReceiptNumberByCode2(List<OpeWarehouseReserve> codeTmp, String receiptNumber);
+
+	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,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