From d00d1d584875b5b38c70c235963b46543a3eba28 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期二, 15 六月 2021 12:30:01 +0800
Subject: [PATCH] 修改发送邮件
---
src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
index 9924439..88d24c1 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
@@ -530,7 +530,7 @@
}
@Override
- public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status) {
+ public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply,boolean isExpired) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("reagentName", reagentName);
@@ -538,7 +538,12 @@
params.put("userId",id);
params.put("productSn",productSn);
params.put("applyCode",applyCode);
- params.put("status",status);
+ if (isExpired) {
+ params.put("status",ApplyStatus.EXPIRED);
+ }else{
+ params.put("status", status);
+ }
+ params.put("isAllApply",isAllApply);
return this.opeApplyDao.getOpeApplyReserveTotalCountFor(params);
} catch (DataAccessException e) {
logger.error(e.getMessage(), e);
@@ -548,7 +553,7 @@
}
@Override
public List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first,
- Integer pageSize,String productSn,String applyCode,Integer status) {
+ Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply,boolean isExpired) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("reagentName", reagentName);
@@ -558,7 +563,12 @@
params.put("pageSize", pageSize);
params.put("productSn",productSn);
params.put("applyCode",applyCode);
- params.put("status",status);
+ if (isExpired) {
+ params.put("status",ApplyStatus.EXPIRED);
+ }else{
+ params.put("status", status);
+ }
+ params.put("isAllApply",isAllApply);
return this.opeApplyDao.getOpeApplyReserveListFor(params);
} catch (DataAccessException e) {
logger.error(e.getMessage(), e);
@@ -682,12 +692,12 @@
if (codeList == null){
//无条码入库 不需要增加状态和流向
//1.1库存表增加
- opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo);
+ opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId);
}else{
//条码入库
assert codeList.size() > 0;
//1.1入库(库存表增加)
- opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo);
+ opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId);
//1.2试剂状态表增加,流向增加
opeReagentStatusService.orderInputWarehouseReagentStatusAndUseFlow(opeApplyReserve,consigneeId,codeList,oo);
}
--
Gitblit v1.9.2