From 1cbac7aa20a183a9a893651bf0cef24b1909eb5c Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期一, 01 二月 2021 10:19:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master --- src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 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..952b16d 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, + List<OpeUseFlow> getOpeUseFlowListByName(String houseName,String reagentId, String reagentCode,String containerCode, Integer status, String userId, Date startDate,Date endDate, Integer first, Integer pageSize); - 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); boolean update(OpeUseFlow opeUseFlow); @@ -34,4 +37,23 @@ 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); + } -- Gitblit v1.9.2