From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Mon, 01 Jul 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/entity/OpeReagentStatus.java | 227 +++++---------------------------------------------------
1 files changed, 23 insertions(+), 204 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/OpeReagentStatus.java b/src/main/java/com/nanometer/smartlab/entity/OpeReagentStatus.java
index f42878c..8a86bc3 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeReagentStatus.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeReagentStatus.java
@@ -8,229 +8,48 @@
import com.nanometer.smartlab.entity.enumtype.RealStatus;
import com.nanometer.smartlab.entity.enumtype.StoreType;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
/**
* Created by johnny on 17/11/23.
*/
+@Getter
+@Setter
+@Accessors(chain = true)
@SuppressWarnings("serial")
public class OpeReagentStatus implements Serializable {
- private String id;
- private String reagentId;
+ private Long id;
+ private Long reagentId;
private String articleNumber;
private String reagentCode;
- private ArrivalStatus status;
- private RealStatus realstatus;
- private ValidFlag validFlag;
- private String houseId;
- private String containerId;
- private String userId;
- private String userName;
+ private Integer status;
+ private Integer realstatus;
+ private Integer validFlag;
+ private Long houseId;
+ private Long containerId;
+ private Long userId;
+
private Timestamp updateTime;
private BigDecimal remainder;
private String place;
- private StoreType storeType;
- private String projectNum;
+ private Integer storeType;
+ private Long projectId;
private String applyCode;
private String orderCode;
+ private String startReagentCode;
+ private String endReagentCode;
+ private Integer arrivalNum;
+
+ //非数据库字段
private String houseName;
private String containerCode;
private SysReagent reagent;
-
private String name;
private String cas;
private Integer deadline;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getArticleNumber() {
- return articleNumber;
- }
-
- public void setArticleNumber(String articleNumber) {
- this.articleNumber = articleNumber;
- }
-
- public String getReagentCode() {
- return reagentCode;
- }
-
- public void setReagentCode(String reagentCode) {
- this.reagentCode = reagentCode;
- }
-
- public ArrivalStatus getStatus() {
- return status;
- }
-
- public void setStatus(ArrivalStatus status) {
- this.status = status;
- }
-
- public ValidFlag getValidFlag() {
- return validFlag;
- }
-
- public void setValidFlag(ValidFlag validFlag) {
- this.validFlag = validFlag;
- }
-
- public String getHouseId() {
- return houseId;
- }
-
- public void setHouseId(String houseId) {
- this.houseId = houseId;
- }
-
- public String getContainerId() {
- return containerId;
- }
-
- public void setContainerId(String containerId) {
- this.containerId = containerId;
- }
-
- public RealStatus getRealstatus() {
- return realstatus;
- }
-
- public void setRealstatus(RealStatus realstatus) {
- this.realstatus = realstatus;
- }
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public BigDecimal getRemainder() {
- return remainder;
- }
-
- public void setRemainder(BigDecimal remainder) {
- this.remainder = remainder;
- }
-
- public String getHouseName() {
- return houseName;
- }
-
- public void setHouseName(String houseName) {
- this.houseName = houseName;
- }
-
- public SysReagent getReagent() {
- return reagent;
- }
-
- public void setReagent(SysReagent reagent) {
- this.reagent = reagent;
- }
-
- public String getContainerCode() {
- return containerCode;
- }
-
- public void setContainerCode(String containerCode) {
- this.containerCode = containerCode;
- }
-
- public Timestamp getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Timestamp updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getPlace() {
- return place;
- }
-
- public void setPlace(String place) {
- this.place = place;
- }
-
- public String getReagentId() {
- return reagentId;
- }
-
- public void setReagentId(String reagentId) {
- this.reagentId = reagentId;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getCas() {
- return cas;
- }
-
- public void setCas(String cas) {
- this.cas = cas;
- }
-
- public Integer getDeadline() {
- return deadline;
- }
-
- public void setDeadline(Integer deadline) {
- this.deadline = deadline;
- }
-
- public String getProjectNum() {
- return projectNum;
- }
-
- public void setProjectNum(String projectNum) {
- this.projectNum = projectNum;
- }
-
- public StoreType getStoreType() {
- return storeType;
- }
-
- public void setStoreType(StoreType storeType) {
- this.storeType = storeType;
- }
-
- public String getApplyCode() {
- return applyCode;
- }
-
- public void setApplyCode(String applyCode) {
- this.applyCode = applyCode;
- }
-
- public String getOrderCode() {
- return orderCode;
- }
-
- public void setOrderCode(String orderCode) {
- this.orderCode = orderCode;
- }
+ private String userName;
}
--
Gitblit v1.9.2