From e997eee6b747c343e432783111371aca0bd89306 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Tue, 29 Jun 2021 13:15:24 +0800
Subject: [PATCH] 导出试剂
---
src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java | 62 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java b/src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java
index d93ae38..2d8c5cb 100644
--- a/src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java
@@ -7,7 +7,9 @@
import com.nanometer.smartlab.entity.SysUser;
import com.nanometer.smartlab.entity.dto.ApplyListDto;
+import com.nanometer.smartlab.exception.BusinessException;
import com.nanometer.smartlab.service.SysUserService;
+import com.nanometer.smartlab.util.FacesUtils;
import com.nanometer.smartlab.util.Utils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -73,6 +75,8 @@
private List<SysReagent> reagentSelectList;
+ private OpeUseFlow selectedOne;
+
public List<SysReagent> getReagentSelectList() {
if (this.reagentSelectList == null) {
this.initReagentSelectList();
@@ -106,6 +110,7 @@
if (count > 0) {
list = opeUseFlowService.getOpeUseFlowListByName(houseName,reagentId, reagentCode, containerCode,null, getUserId(),startDate,endDate, first, pageSize);
}
+ selectedOne = null;
} catch (Exception e) {
logger.error(e);
}
@@ -114,21 +119,20 @@
@Override
public OpeUseFlow getRowData(String rowKey) {
- Iterator<OpeUseFlow> iterator = this.iterator();
- OpeUseFlow temp = null;
- if(iterator!= null)
- {
- while(iterator.hasNext())
- {
- temp=iterator.next();
- if(rowKey.equals(temp.getId()))
- {
- return temp;
- }
- }
- }
-
- return temp;
+// Iterator<OpeUseFlow> iterator = this.iterator();
+// OpeUseFlow temp = null;
+// if(iterator!= null)
+// {
+// while(iterator.hasNext())
+// {
+// temp=iterator.next();
+// if(rowKey.equals(temp.getId()))
+// {
+// return temp;
+// }
+// }
+// }
+ return opeUseFlowService.selectById(rowKey);
}
};
}
@@ -211,6 +215,26 @@
}
}
+ //报废试剂
+ public void scrapReagent(){
+ if (this.selectedOne == null) {
+ FacesUtils.warn("请选择");
+ return;
+ }
+ try {
+ String reagentCode = this.selectedOne.getReagentCode();
+ String reagentId = this.selectedOne.getReagent().getId();
+ opeUseFlowService.scrapReagent(reagentId, reagentCode, getUserId());
+ FacesUtils.warn("操作成功");
+ } catch (BusinessException e) {
+ FacesUtils.warn(e.getMessage());
+ } catch (Exception e) {
+ e.printStackTrace();
+ FacesUtils.warn("操作失败");
+ }
+
+ }
+
public void setStartDate(Date startDate) {
this.startDate = startDate;
}
@@ -243,4 +267,12 @@
public void setContainerCode(String containerCode) {
this.containerCode = containerCode;
}
+
+ public OpeUseFlow getSelectedOne() {
+ return selectedOne;
+ }
+
+ public void setSelectedOne(OpeUseFlow selectedOne) {
+ this.selectedOne = selectedOne;
+ }
}
--
Gitblit v1.9.2