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/controller/LaboratoryStockMngController.java | 70 +++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java
index 8fd719b..13743de 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java
@@ -59,6 +59,7 @@
private List<SysLaboratoryContainer> laboratoryContainers;
private String reagentCode;
+ private String labName;
/**
* 数据模型
@@ -93,11 +94,11 @@
System.out.println(reagentId);
try {
int count = opeReagentStatusService.getOpeReagentStatusTotalCountForLab(reagentId, null,
- ArrivalStatus.LABORATORY.getKey(), reagentCode, getUserId());
+ ArrivalStatus.LABORATORY.getKey(), reagentCode, getUserId(),labName);
this.setRowCount(count);
if (count > 0) {
list = opeReagentStatusService.getOpeReagentStatusListForLab(reagentId, null,
- ArrivalStatus.LABORATORY.getKey(), reagentCode, getUserId(), first, pageSize);
+ ArrivalStatus.LABORATORY.getKey(), reagentCode, getUserId(),labName, first, pageSize);
}
} catch (Exception e) {
logger.error(e);
@@ -107,17 +108,17 @@
@Override
public OpeReagentStatus getRowData(String rowKey) {
- Iterator<OpeReagentStatus> iterator = this.iterator();
- if (iterator != null) {
- OpeReagentStatus su = null;
- while (iterator.hasNext()) {
- su = iterator.next();
- if (rowKey.equals(su.getId())) {
- return su;
- }
- }
- }
- return null;
+// Iterator<OpeReagentStatus> iterator = this.iterator();
+// if (iterator != null) {
+// OpeReagentStatus su = null;
+// while (iterator.hasNext()) {
+// su = iterator.next();
+// if (rowKey.equals(su.getId())) {
+// return su;
+// }
+// }
+// }
+ return null;
}
};
}
@@ -143,26 +144,40 @@
} catch (Exception e) {
logger.error(e);
}
+ selectedStoreList = null;
return list;
}
@Override
public OpeReagentStatus getRowData(String rowKey) {
- Iterator<OpeReagentStatus> iterator = this.iterator();
- if (iterator != null) {
- OpeReagentStatus su = null;
- while (iterator.hasNext()) {
- su = iterator.next();
- if (rowKey.equals(su.getId())) {
- return su;
- }
- }
- }
- return null;
+// Iterator<OpeReagentStatus> iterator = this.iterator();
+// if (iterator != null) {
+// OpeReagentStatus su = null;
+// while (iterator.hasNext()) {
+// su = iterator.next();
+// if (rowKey.equals(su.getId())) {
+// return su;
+// }
+// }
+// }
+ return opeReagentStatusService.getOpeReagentStatus(rowKey);
}
};
}
return reagentStoreDataModel;
+ }
+
+
+ public void exportLabStock() {
+ try {
+ List<Map> list = opeReagentStatusService.selectExportList(reagentId, null,
+ ArrivalStatus.LABORATORY.getKey(), reagentCode, getUserId(),labName);
+ opeReagentStatusService.exportLabStock2Excel(list);
+ FacesUtils.info("导出成功");
+ }catch (Exception e){
+ e.printStackTrace();
+ FacesUtils.warn("导出失败");
+ }
}
public int getAction() {
@@ -270,4 +285,11 @@
this.laboratoryContainers = laboratoryContainers;
}
+ public String getLabName() {
+ return labName;
+ }
+
+ public void setLabName(String labName) {
+ this.labName = labName;
+ }
}
--
Gitblit v1.9.2