From d6c65a4e3d1ca7d9a7bd6806c99fee035d0a44eb Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 27 一月 2021 16:54:34 +0800
Subject: [PATCH] 合并
---
src/main/java/com/nanometer/smartlab/entity/OpeApply.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 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..e2eba2e 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeApply.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeApply.java
@@ -6,6 +6,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.sql.Timestamp;
+import java.util.*;
/**
* Created by johnny on 17/11/23.
@@ -84,6 +85,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 +99,9 @@
private BigDecimal applyPrice;
private int stockFlag;
private String stockFlagValue;
+ //用于存放仓库 和仓库货柜的id
+ private String warehouseId;
+ private String warehouseContainerId;
public String getStockFlagValue() {
return stockFlagValue;
@@ -328,9 +333,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 +359,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