From 8beaf701a900ddd5a0a482f425080635ff55166d Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:16:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java | 97 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 72 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java b/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
index 2262797..389d25d 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
@@ -7,30 +7,35 @@
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.List;
+import java.util.Map;
/**
* Created by johnny on 17/11/23.
*/
-public class OpeApplyReserve implements Serializable,Comparable<OpeApplyReserve> {
+public class OpeApplyReserve implements Serializable, Comparable<OpeApplyReserve> {
- private String id;
- // 申购编号
- private String applyCode;
- // 申请数量
- private Integer num;
- // 已领用数量
- private Integer used;
- // 申购试剂
- private SysReagent reagent;
- // 申购者
- private String applyUserId;
- // 批号
- private String articleNumber;
- //领用数量
- private Integer selectNum;
+ private String id;
+ // 申购编号
+ private String applyCode;
+ // 申请数量
+ private Integer num;
+ // 已领用数量
+ private Integer used;
+ // 申购试剂
+ private SysReagent reagent;
+ // 申购者
+ private String applyUserId;
+ // 批号
+ private String articleNumber;
+ //领用数量
+ private Integer selectNum;
- private Integer flag;
+ private Integer flag;
private ApplyStatus status;
+ private Integer arrivalNum;
+ private String containerId;
+ private String houseId;
+ private Timestamp arrivalTime;
private String project;
private String projectManage;
@@ -48,6 +53,7 @@
private String startReagentCode2;
private String endReagentCode2;
+ private List<OpeWarehouseReserve> cacheUpdateList;
public String getStartReagentCode2() {
return startReagentCode2;
@@ -169,19 +175,60 @@
this.selectNum = selectNum;
}
- public String getProject() {
- return project;
+ public Integer getArrivalNum() {
+ return arrivalNum;
}
- public void setProject(String project) {
- this.project = project;
+ public void setArrivalNum(Integer arrivalNum) {
+ this.arrivalNum = arrivalNum;
}
- public String getProjectManage() {
- return projectManage;
+ public String getContainerId() {
+ return containerId;
}
- public void setProjectManage(String projectManage) {
- this.projectManage = projectManage;
+ public void setContainerId(String containerId) {
+ this.containerId = containerId;
+ }
+
+ public String getHouseId() {
+ return houseId;
+ }
+
+ public void setHouseId(String houseId) {
+ this.houseId = houseId;
+ }
+
+ public Timestamp getArrivalTime() {
+ return arrivalTime;
+ }
+
+ public void setArrivalTime(Timestamp arrivalTime) {
+ this.arrivalTime = arrivalTime;
+ }
+
+ public String getProject() {
+ return project;
+ }
+
+ public void setProject(String project) {
+ this.project = project;
+ }
+
+ public String getProjectManage() {
+ return projectManage;
+ }
+
+ public void setProjectManage(String projectManage) {
+ this.projectManage = projectManage;
+ }
+
+
+ public List<OpeWarehouseReserve> getCacheUpdateList() {
+ return cacheUpdateList;
+ }
+
+ public void setCacheUpdateList(List<OpeWarehouseReserve> cacheUpdateList) {
+ this.cacheUpdateList = cacheUpdateList;
}
}
--
Gitblit v1.9.2