From af607e09de61badbaef57bc0d38002e48a44ac4c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:48:50 +0800
Subject: [PATCH] 订单领取申领人被删除报错
---
src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java | 63 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
index 2047277..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);
}
}
@@ -501,9 +501,13 @@
//操作状态位仓库领取
Map<String, String> metaMap2 = new HashMap<>();
metaMap2.put("groupId", "operate_status");
-// 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.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());
addParamByUserId(userId, params);
return opeUseFlowDao.countPersonalUseInfo(params);
@@ -548,9 +552,14 @@
//操作状态位仓库领取
Map<String, String> metaMap2 = new HashMap<>();
metaMap2.put("groupId", "operate_status");
-// 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.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);
@@ -563,9 +572,14 @@
Map<String,Object> params = new HashMap<>();
Map<String, String> metaMap2 = new HashMap<>();
metaMap2.put("groupId", "operate_status");
-// 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.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);
@@ -643,9 +662,13 @@
//操作状态位仓库领取
Map<String, String> metaMap2 = new HashMap<>();
metaMap2.put("groupId", "operate_status");
-// 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.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());
addParamByUserId(userId, params);
--
Gitblit v1.9.2