From 12862728f6123b2a9a927f6bad97317bc651d8c2 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 23 四月 2021 15:43:39 +0800
Subject: [PATCH] 修改领用
---
src/main/java/com/nanometer/smartlab/entity/OpeApply.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/OpeApply.java b/src/main/java/com/nanometer/smartlab/entity/OpeApply.java
index 2e35b5c..ad696f2 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeApply.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeApply.java
@@ -2,10 +2,12 @@
import com.nanometer.smartlab.entity.enumtype.ApplyStatus;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import com.nanometer.smartlab.util.Validator;
import java.io.Serializable;
import java.math.BigDecimal;
import java.sql.Timestamp;
+import java.util.*;
/**
* Created by johnny on 17/11/23.
@@ -84,6 +86,7 @@
private String articleNumber;
private String startReagentCode;
private String endReagentCode;
+ private List<String> reagentCodeList;
private String houseId;
private String containerId;
private String placeId;
@@ -97,6 +100,9 @@
private BigDecimal applyPrice;
private int stockFlag;
private String stockFlagValue;
+ //用于存放仓库 和仓库货柜的id
+ private String warehouseId;
+ private String warehouseContainerId;
public String getStockFlagValue() {
return stockFlagValue;
@@ -127,7 +133,7 @@
}
public void setApplyGoal(String applyGoal) {
- this.applyGoal = applyGoal;
+ this.applyGoal = Validator.filter(applyGoal);
}
public String getId() {
@@ -151,7 +157,7 @@
}
public void setNum(Integer num) {
- this.num = num;
+ this.num = Integer.parseInt(Validator.filter(num.toString()));
}
public String getApplyUserId() {
@@ -167,7 +173,7 @@
}
public void setObjective(String objective) {
- this.objective = objective;
+ this.objective = Validator.filter(objective);
}
public Timestamp getCreateTime() {
@@ -205,7 +211,7 @@
this.beforeApproveUserId=beforeApproveUserId;
}
public void setApproveUserId(String approveUserId) {
- this.approveUserId = approveUserId;
+ this.approveUserId = Validator.filter(approveUserId);
}
public String getMemo() {
@@ -328,9 +334,15 @@
this.projectId = projectId;
}
+ public List<String> getReagentCodeList() {
+ return reagentCodeList;
+ }
+ public void setReagentCodeList(List<String> reagentCodeList) {
+ this.reagentCodeList = reagentCodeList;
+ }
- public String getProjectOwner() {
+ public String getProjectOwner() {
return projectOwner;
}
@@ -348,7 +360,23 @@
this.ownerDepartment = ownerDepartment;
}
- @Override
+ public String getWarehouseId() {
+ return warehouseId;
+ }
+
+ public void setWarehouseId(String warehouseId) {
+ this.warehouseId = warehouseId;
+ }
+
+ public String getWarehouseContainerId() {
+ return warehouseContainerId;
+ }
+
+ public void setWarehouseContainerId(String warehouseContainerId) {
+ this.warehouseContainerId = warehouseContainerId;
+ }
+
+ @Override
public int compareTo(OpeApply o) {
if(this.projectOwner == null || o.getProjectOwner() == null){
return 1;
--
Gitblit v1.9.2