From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java | 210 +++------------------------------------------------
1 files changed, 15 insertions(+), 195 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java b/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
index 20d23da..b0e55c7 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
@@ -1,7 +1,10 @@
package com.nanometer.smartlab.entity;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.nanometer.smartlab.entity.enumtype.ApplyStatus;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import lombok.Getter;
+import lombok.Setter;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -12,9 +15,12 @@
/**
* Created by johnny on 17/11/23.
*/
+@Getter
+@Setter
+@JsonIgnoreProperties(value = {"handler"})
public class OpeApplyReserve implements Serializable, Comparable<OpeApplyReserve> {
-
- private String id;
+ //申请id
+ private Long id;
// 申购编号
private String applyCode;
// 申请数量
@@ -24,7 +30,7 @@
// 申购试剂
private SysReagent reagent;
// 申购者
- private String applyUserId;
+ private Long applyUserId;
// 批号
private String articleNumber;
//领用数量
@@ -33,211 +39,25 @@
private Integer flag;
private ApplyStatus status;
private Integer arrivalNum;
- private String containerId;
- private String houseId;
+ private Long containerId;
+ private Long houseId;
private Timestamp arrivalTime;
- private String project;
+ private String projectName;
private String projectManage;
private String applyUser;
- public ApplyStatus getStatus() {
- return status;
- }
-
- public void setStatus(ApplyStatus status) {
- this.status = status;
- }
-
- private BigDecimal startReagentCode;
- private BigDecimal endReagentCode;
+ private String startReagentCode;
+ private String endReagentCode;
private String startReagentCode2;
private String endReagentCode2;
private List<OpeWarehouseReserve> cacheUpdateList;
- public String getStartReagentCode2() {
- return startReagentCode2;
- }
-
- public void setStartReagentCode2(String startReagentCode2) {
- this.startReagentCode2 = startReagentCode2;
- }
-
- public String getEndReagentCode2() {
- return endReagentCode2;
- }
-
- public void setEndReagentCode2(String endReagentCode2) {
- this.endReagentCode2 = endReagentCode2;
- }
-
- public Integer getFlag() {
- return flag;
- }
-
- public void setFlag(Integer flag) {
- this.flag = flag;
- }
-
- public BigDecimal getStartReagentCode() {
- return startReagentCode;
- }
-
- public void setStartReagentCode(BigDecimal startReagentCode) {
- this.startReagentCode = startReagentCode;
- }
-
- public BigDecimal getEndReagentCode() {
- return endReagentCode;
- }
-
- public void setEndReagentCode(BigDecimal endReagentCode) {
- this.endReagentCode = endReagentCode;
- }
-
- private List<String> reagentCode;
-
- public List<String> getReagentCode(){
- return reagentCode;
- }
-
- public void setReagentCode(List<String> reagentCode){
- this.reagentCode=reagentCode;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getApplyCode() {
- return applyCode;
- }
-
- public void setApplyCode(String applyCode) {
- this.applyCode = applyCode;
- }
-
- public Integer getNum() {
- return num;
- }
-
- public void setNum(Integer num) {
- this.num = num;
- }
-
- public Integer getUsed() {
- return used;
- }
-
- public void setUsed(Integer used) {
- this.used = used;
- }
-
- public SysReagent getReagent() {
- return reagent;
- }
-
- public void setReagent(SysReagent reagent) {
- this.reagent = reagent;
- }
-
+ private List<String> reagentCodes;
@Override
public int compareTo(OpeApplyReserve o) {
// TODO Auto-generated method stub
return 0;
- }
-
- public String getApplyUserId() {
- return applyUserId;
- }
-
- public void setApplyUserId(String applyUserId) {
- this.applyUserId = applyUserId;
- }
-
- public String getArticleNumber() {
- return articleNumber;
- }
-
- public void setArticleNumber(String articleNumber) {
- this.articleNumber = articleNumber;
- }
-
- public Integer getSelectNum() {
- return selectNum;
- }
-
- public void setSelectNum(Integer selectNum) {
- this.selectNum = selectNum;
- }
-
- public Integer getArrivalNum() {
- return arrivalNum;
- }
-
- public void setArrivalNum(Integer arrivalNum) {
- this.arrivalNum = arrivalNum;
- }
-
- public String getContainerId() {
- return containerId;
- }
-
- 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