From c3510da29a7974c6af7ff3de1ade3db429d6f848 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 14:27:59 +0800
Subject: [PATCH] 申购管理申请履历显示所有历史单据，提交时如有无效试剂耗材报错
---
src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 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..5092e03 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
@@ -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