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/entity/OpeApplyReserve.java |  106 ++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 81 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..20d23da 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
@@ -7,33 +7,39 @@
 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;
+	private String applyUser;
 
 	public ApplyStatus getStatus() {
 		return status;
@@ -48,6 +54,7 @@
 
 	private String startReagentCode2;
 	private String endReagentCode2;
+	private List<OpeWarehouseReserve> cacheUpdateList;
 
 	public String getStartReagentCode2() {
 		return startReagentCode2;
@@ -169,19 +176,68 @@
 		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;
+	}
+
+	public String getApplyUser() {
+		return applyUser;
+	}
+
+	public void setApplyUser(String applyUser) {
+		this.applyUser = applyUser;
 	}
 }

--
Gitblit v1.9.2