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

---
 src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java |   71 +++++++++++++++++++++++++++++++++--
 1 files changed, 66 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 1f93c1d..4aa4904 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java
@@ -1,6 +1,11 @@
 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.OpeUseFlowQueryDto;
+import com.nanometer.smartlab.entity.dto.PersonUseDetail;
+import com.nanometer.smartlab.model.CommonPage;
 
 import java.text.ParseException;
 import java.util.Date;
@@ -15,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, Integer status, String userId, Date startDate,Date endDate,
-			Integer first, Integer pageSize);
+	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, Integer status, String userId, Date startDate,Date endDate);
+	int getOpeUseFlowTotalCountByName(String houseName, Long reagentId, String reagentCode,String containerCode, Integer status, Long userId, Date startDate,Date endDate,Integer operatestate);
 
 	boolean update(OpeUseFlow opeUseFlow);
 
@@ -34,4 +41,58 @@
 	void updateTimeByCode(String code);
 
 	OpeUseFlow getOpeUseFlowByCode(String reagentCode);
+
+    void updateReceiptNumber(String code, String receiptNumber,String note);
+
+	void updateReceiptNumberByCode(List<OpeApplyReserve> codeTmp,String receiptNumber,String note);
+
+	Map<Long, Integer> getRegentInfoFromReceiptNumber(String receiptNumber);
+
+	Map<String,Long>  getApplyUserByReagentCode(String reagentCode);
+
+    void updateReceiptNumberByCode2(List<OpeWarehouseReserve> codeTmp, String receiptNumber,String note);
+
+	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,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);
+
+	int getApplyInfoSize(String receiptNumber);
+
+    int getOpeUseFlow(OpeUseFlow opeUseFlow);
+
+    void scrapReagent(Long reagentId,String reagentCode, Long userId);
+
+    OpeUseFlow selectById(String rowKey);
+
+	OpeUseFlow selectByReceiptNumber(String receiptNumber,Long userId);
+
+    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, Long 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);
+
+
+	/**
+	 * 获取最新流向
+	 * @param reagentCode
+	 * @return
+	 */
+	OpeUseFlow getLastUseFlow(String reagentCode);
+
+
 }

--
Gitblit v1.9.2