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/OpeUseFlowServiceImpl.java | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
index d14da94..66dc833 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
@@ -56,8 +56,6 @@
@Resource
private OpeReagentStatusService opeReagentStatusService;
@Resource
- private OpeUseFlowService opeUseFlowService;
- @Resource
private SysReagentService sysReagentService;
@Resource
private BaseMetaDao baseMetaDao;
@@ -71,7 +69,7 @@
}
if(opeUseFlow.getCreateTime()==null){
- opeUseFlow.setCreateTime(new Timestamp(System.currentTimeMillis()));
+ opeUseFlow.setCreateTime(new Timestamp(System.currentTimeMillis()+1000));
}
this.opeUseFlowDao.insertOpeUseFlow(opeUseFlow);
@@ -382,21 +380,19 @@
public void updateReceiptNumberByCode(List<OpeApplyReserve> selectedTmpOrderList,String receiptNumber) {
for (OpeApplyReserve oar : selectedTmpOrderList) {
- //根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
- List<String> codeTmp = opeReagentStatusService
- .generateReagentCode(oar.getStartReagentCode2(), oar.getEndReagentCode2());
- assert codeTmp.size() > 0;
-
if (oar.getFlag() == 1) {
//库中领取 code存的是 试剂状态的id
- for (String statusId : codeTmp) {
+ for (String statusId : oar.getReagentCode()) {
String code = opeReagentStatusService.getOpeReagentStatus(statusId).getReagentCode();
//此时状态为领用待入库
- opeUseFlowService.updateReceiptNumber(code, receiptNumber);
+ this.updateReceiptNumber(code, receiptNumber);
}
}else{
+ //根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
+ List<String> codeTmp = opeReagentStatusService
+ .generateReagentCode(oar.getStartReagentCode2(), oar.getEndReagentCode2());
for (String code : codeTmp) {
- opeUseFlowService.updateReceiptNumber(code, receiptNumber);
+ this.updateReceiptNumber(code, receiptNumber);
}
}
@@ -436,21 +432,19 @@
@Override
public void updateReceiptNumberByCode2(List<OpeWarehouseReserve> selectTmpList, String receiptNumber) {
for (OpeWarehouseReserve owr : selectTmpList) {
- //根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
- List<String> codeTmp = opeReagentStatusService
- .generateReagentCode(owr.getStartReagentCode2(), owr.getEndReagentCode2());
- assert codeTmp.size() > 0;
-
if (owr.getFlag() == 1) {
//库中领取 code存的是 试剂状态的id
- for (String statusId : codeTmp) {
+ for (String statusId : owr.getReagentCodes()) {
String code = opeReagentStatusService.getOpeReagentStatus(statusId).getReagentCode();
//此时状态为领用待入库
- opeUseFlowService.updateReceiptNumber(code, receiptNumber);
+ this.updateReceiptNumber(code, receiptNumber);
}
}else{
+ //根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
+ List<String> codeTmp = opeReagentStatusService
+ .generateReagentCode(owr.getStartReagentCode2(), owr.getEndReagentCode2());
for (String code : codeTmp) {
- opeUseFlowService.updateReceiptNumber(code, receiptNumber);
+ this.updateReceiptNumber(code, receiptNumber);
}
}
@@ -541,4 +535,9 @@
}
+ @Override
+ public int getOpeUseFlow(OpeUseFlow opeUseFlow) {
+ return opeUseFlowDao.countOpeUseFlow(opeUseFlow);
+ }
+
}
--
Gitblit v1.9.2