From b30d8a0da429680f77326fca9dcf0877688c7a77 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Fri, 12 Nov 2021 17:05:11 +0800
Subject: [PATCH] 订单领取修改过期查询
---
src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
index b0a143e..1bccad2 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
@@ -374,12 +374,12 @@
}
@Override
- public void updateReceiptNumber(String code, String receiptNumber) {
- opeUseFlowDao.updateReceiptNumber(code, receiptNumber);
+ public void updateReceiptNumber(String code, String receiptNumber,String note) {
+ opeUseFlowDao.updateReceiptNumber(code, receiptNumber,note);
}
@Transactional
- public void updateReceiptNumberByCode(List<OpeApplyReserve> selectedTmpOrderList,String receiptNumber) {
+ public void updateReceiptNumberByCode(List<OpeApplyReserve> selectedTmpOrderList,String receiptNumber,String note) {
for (OpeApplyReserve oar : selectedTmpOrderList) {
if (oar.getFlag() == 1) {
@@ -387,14 +387,14 @@
for (String statusId : oar.getReagentCode()) {
String code = opeReagentStatusService.getOpeReagentStatus(statusId).getReagentCode();
//此时状态为领用待入库
- this.updateReceiptNumber(code, receiptNumber);
+ this.updateReceiptNumber(code, receiptNumber,note);
}
}else{
//根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
List<String> codeTmp = opeReagentStatusService
.generateReagentCode(oar.getStartReagentCode2(), oar.getEndReagentCode2());
for (String code : codeTmp) {
- this.updateReceiptNumber(code, receiptNumber);
+ this.updateReceiptNumber(code, receiptNumber,note);
}
}
@@ -432,21 +432,21 @@
}
@Override
- public void updateReceiptNumberByCode2(List<OpeWarehouseReserve> selectTmpList, String receiptNumber) {
+ public void updateReceiptNumberByCode2(List<OpeWarehouseReserve> selectTmpList, String receiptNumber,String note) {
for (OpeWarehouseReserve owr : selectTmpList) {
if (owr.getFlag() == 1) {
//库中领取 code存的是 试剂状态的id
for (String statusId : owr.getReagentCodes()) {
String code = opeReagentStatusService.getOpeReagentStatus(statusId).getReagentCode();
//此时状态为领用待入库
- this.updateReceiptNumber(code, receiptNumber);
+ this.updateReceiptNumber(code, receiptNumber,note);
}
}else{
//根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
List<String> codeTmp = opeReagentStatusService
.generateReagentCode(owr.getStartReagentCode2(), owr.getEndReagentCode2());
for (String code : codeTmp) {
- this.updateReceiptNumber(code, receiptNumber);
+ this.updateReceiptNumber(code, receiptNumber,note);
}
}
@@ -469,22 +469,22 @@
if (null != startDate){
try {
- params.put("startDate",sdfstart.format(startDate));
+ params.put("startTime",sdfstart.format(startDate));
}catch (Exception e){
e.printStackTrace();
}
}else {
- params.put("startDate",sdfstart.format(startTime));
+ params.put("startTime",sdfstart.format(startTime));
}
if (null != endDate){
try {
- params.put("endDate",sdfend.format(endDate));
+ params.put("endTime",sdfend.format(endDate));
}catch (Exception e){
e.printStackTrace();
}
}else {
- params.put("endDate",sdfend.format(now));
+ params.put("endTime",sdfend.format(now));
}
params.put("userId", userId);
@@ -505,6 +505,10 @@
List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
params.put("operatestate", baseMetas.get(0).getId());
+ metaMap2.put("metaKey", String.valueOf(OperateStatus.TRANSFER.getKey()));
+ List<BaseMeta> baseMetas1 = baseMetaDao.getBaseMetaList(metaMap2);
+ params.put("operatestate1", baseMetas1.get(0).getId());
+
addParamByUserId(userId, params);
return opeUseFlowDao.countPersonalUseInfo(params);
}
@@ -522,21 +526,21 @@
Date startTime = cal.getTime();
if (null != startDate){
try {
- params.put("startDate",sdfstart.format(startDate));
+ params.put("startTime",sdfstart.format(startDate));
}catch (Exception e){
e.printStackTrace();
}
}else {
- params.put("startDate",sdfstart.format(startTime));
+ params.put("startTime",sdfstart.format(startTime));
}
if (null != endDate){
try {
- params.put("endDate",sdfend.format(endDate));
+ params.put("endTime",sdfend.format(endDate));
}catch (Exception e){
e.printStackTrace();
}
}else {
- params.put("endDate",sdfend.format(now));
+ params.put("endTime",sdfend.format(now));
}
params.put("userId", userId);
params.put("receiptNumber", receiptNumber);
@@ -551,6 +555,11 @@
metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
params.put("operatestate", baseMetas.get(0).getId());
+
+ metaMap2.put("metaKey", String.valueOf(OperateStatus.TRANSFER.getKey()));
+ List<BaseMeta> baseMetas1 = baseMetaDao.getBaseMetaList(metaMap2);
+ params.put("operatestate1", baseMetas1.get(0).getId());
+
params.put("first", first);
params.put("pageSize", pageSize);
@@ -566,6 +575,11 @@
metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
params.put("operatestate", baseMetas.get(0).getId());
+
+ metaMap2.put("metaKey", String.valueOf(OperateStatus.TRANSFER.getKey()));
+ List<BaseMeta> baseMetas1 = baseMetaDao.getBaseMetaList(metaMap2);
+ params.put("operatestate1", baseMetas1.get(0).getId());
+
params.put("receiptNumber", receiptNumber);
return opeUseFlowDao.getApplyInfo(params);
@@ -581,6 +595,11 @@
metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
params.put("operatestate", baseMetas.get(0).getId());
+
+ metaMap2.put("metaKey", String.valueOf(OperateStatus.TRANSFER.getKey()));
+ List<BaseMeta> baseMetas1 = baseMetaDao.getBaseMetaList(metaMap2);
+ params.put("operatestate1", baseMetas1.get(0).getId());
+
params.put("receiptNumber", receiptNumber);
return opeUseFlowDao.getApplyInfoSize(params);
@@ -647,6 +666,10 @@
List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
params.put("operatestate", baseMetas.get(0).getId());
+ metaMap2.put("metaKey", String.valueOf(OperateStatus.TRANSFER.getKey()));
+ List<BaseMeta> baseMetas1 = baseMetaDao.getBaseMetaList(metaMap2);
+ params.put("operatestate1", baseMetas1.get(0).getId());
+
addParamByUserId(userId, params);
return opeUseFlowDao.selectByReceiptNumber(params);
--
Gitblit v1.9.2