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/OpeReagentStatusService.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
index a193774..e32eaf2 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
@@ -1,11 +1,13 @@
 package com.nanometer.smartlab.service;
 
 import com.nanometer.smartlab.entity.*;
+import com.nanometer.smartlab.entity.dto.PersonUseDetail;
 import com.nanometer.smartlab.exception.BusinessException;
 
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by maweiqing on 17/12/12.
@@ -33,9 +35,9 @@
 			String userId);
 
 	public List<OpeReagentStatus> getOpeReagentStatusListForLab(String name, String articleNumber, Integer status,
-																String reagentCode, String userId, Integer first, Integer pageSize);
+																String reagentCode, String userId, String labName, Integer first, Integer pageSize);
 	public int getOpeReagentStatusTotalCountForLab(String name, String articleNumber, Integer status, String reagentCode,
-												   String userId);
+												   String userId,String labName);
 	List<OpeReagentStatus> getOpeReagentStatusListByName(String reagentId, String articleNumber, Integer status,
 			String reagentCode, String userId, Integer first, Integer pageSize);
 
@@ -67,7 +69,7 @@
 	boolean updateReagentStatus(OpeReagentStatus opeReagentStatus);
 	boolean updateReagentStatus2(OpeReagentStatus opeReagentStatus);
 
-	boolean updateReagentStatus3(OpeReagentStatus opeReagentStatus);
+	boolean updateReagentStatus3(List<String> reagentCodes,String userId,String projectNum,String laboratoryId,String laboratoryContainerId);
 
 	int getLogOpeReagentStatusTotalCount(String reagentLogId, Integer status, String userLogId, String loginId);
 
@@ -88,7 +90,7 @@
 
 	void updateTimeByCode(String code);
 
-	void batchUpdateStatusByCode(List<OpeReagentStatus> list) throws Exception;
+	void batchUpdateStatusByCode(List<PersonUseDetail> list) throws Exception;
 
 	public List<OpeReagentStatus> selectByReId(String id);
 	public void updateByReId(String newReId,String oldReId);
@@ -102,8 +104,14 @@
 
 	List<String> generateReagentCode(String startReagentCode2, String endReagentCode2);
 
-	void updateOpeReagentStatus(OpeReagentStatus opeReagentStatus);
+	int updateOpeReagentStatus(OpeReagentStatus opeReagentStatus);
 
 	int getReagentNumInWarehouse(String id, String articleNumber, String warehouseId);
 
+    List<Map> selectExportList(String name, String articleNumber, Integer status,
+							   String reagentCode, String userId,String labName);
+
+	void exportLabStock2Excel(List<Map> list) throws Exception;
+
+    OpeReagentStatus getStatus(String reagentId, String reagentCode);
 }

--
Gitblit v1.9.2