From 760e53aeef80c287ced8b6716336733867fc7565 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期四, 07 三月 2024 08:30:57 +0800
Subject: [PATCH] 新增需求
---
src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java | 22 +++++++++++++++++++---
1 files changed, 19 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 2e97dae..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;
@@ -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);
@@ -67,4 +69,18 @@
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