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/OpeWarehouseReserve.java | 197 ++++--------------------------------------------
1 files changed, 18 insertions(+), 179 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/OpeWarehouseReserve.java b/src/main/java/com/nanometer/smartlab/entity/OpeWarehouseReserve.java
index a53e795..cb489fc 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeWarehouseReserve.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeWarehouseReserve.java
@@ -5,207 +5,46 @@
import java.sql.Timestamp;
import java.util.List;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import lombok.Getter;
+import lombok.Setter;
/**
* Created by johnny on 17/12/15.
*/
+@Getter
+@Setter
@SuppressWarnings("serial")
+@JsonIgnoreProperties(value = {"handler"})
public class OpeWarehouseReserve implements Serializable {
- private String id;
- private String reagentId;
- private SysReagent reagent;
+ private Long id;
+ private Long reagentId;
private String articleNumber;
private Integer reserve;
private Timestamp updateTime;
private ValidFlag validFlag;
+ private String applyCode;
+ private String orderCode;
+ private Long warehouseId;
+ private Long containerId;
+ private Long userId;
+
+
+
+ //非数据库字段
private Integer selectNum;
private BigDecimal startReagentCode;
private BigDecimal endReagentCode;
private Integer flag;
- private String warehouseId;
private String warehouseName;
private String startReagentCode2;
private String endReagentCode2;
- private String applyCode;
- private String orderCode;
- //新增 货柜id
- private String containerId;
- private String userId;
-
-
/**
* 补贴条码的暂存领用数量
*/
public Integer useNum;
- public String getWarehouseId() {
- return warehouseId;
- }
-
- public void setWarehouseId(String warehouseId) {
- this.warehouseId = warehouseId;
- }
-
- public String getWarehouseName() {
- return warehouseName;
- }
-
- public void setWarehouseName(String warehouseName) {
- this.warehouseName = warehouseName;
- }
-
- 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;
- }
-
private List<String> reagentCodes;
-
- 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;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getReagentId() {
- return reagentId;
- }
-
- public void setReagentId(String reagentId) {
- this.reagentId = reagentId;
- }
-
- public String getArticleNumber() {
- return articleNumber;
- }
-
- public void setArticleNumber(String articleNumber) {
- this.articleNumber = articleNumber;
- }
-
- public Integer getReserve() {
- return reserve;
- }
-
- public void setReserve(Integer reserve) {
- this.reserve = reserve;
- }
-
- public Timestamp getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Timestamp updateTime) {
- this.updateTime = updateTime;
- }
-
- public SysReagent getReagent() {
- return reagent;
- }
-
- public void setReagent(SysReagent reagent) {
- this.reagent = reagent;
- }
-
- public ValidFlag getValidFlag() {
- return validFlag;
- }
-
- public void setValidFlag(ValidFlag validFlag) {
- this.validFlag = validFlag;
- }
-
- public List<String> getReagentCodes() {
- return reagentCodes;
- }
-
- public void setReagentCodes(List<String> reagentCodes) {
- this.reagentCodes = reagentCodes;
- }
-
- public Integer getSelectNum() {
- return selectNum;
- }
-
- public void setSelectNum(Integer selectNum) {
- this.selectNum = selectNum;
- }
-
- 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;
- }
-
- public Integer getUseNum() {
- return useNum;
- }
-
- public void setUseNum(Integer useNum) {
- this.useNum = useNum;
- }
-
- public String getContainerId() {
- return containerId;
- }
-
- public void setContainerId(String containerId) {
- this.containerId = containerId;
- }
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
+ private SysReagent reagent;
}
--
Gitblit v1.9.2