From 59d9ea33f503e363f2e2941c7c00cc9dd9d9d1c7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期二, 28 十一月 2023 11:00:42 +0800
Subject: [PATCH] 修改课题管理bug
---
src/main/java/com/nanometer/smartlab/entity/OpeUseFlow.java | 80 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 76 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/OpeUseFlow.java b/src/main/java/com/nanometer/smartlab/entity/OpeUseFlow.java
index 108a403..110400e 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeUseFlow.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeUseFlow.java
@@ -1,5 +1,6 @@
package com.nanometer.smartlab.entity;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.nanometer.smartlab.entity.enumtype.ArrivalStatus;
import com.nanometer.smartlab.entity.enumtype.RealStatus;
import com.nanometer.smartlab.entity.enumtype.StoreType;
@@ -9,9 +10,12 @@
import java.math.BigDecimal;
import java.sql.Timestamp;
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
+
/**
* Created by johnny on 17/11/23.
*/
+@JsonInclude(NON_NULL)
public class OpeUseFlow implements Serializable {
private String id;
@@ -26,22 +30,32 @@
private BigDecimal remainder;
private String place;
private StoreType storeType;
+ // 体积
+ private BigDecimal volume;
private SysReagent reagent;
private String userName;
private String articleNumber;
-
+
private String laboratoryName;
private String warehouseName;
-
+
private String warehouseContainerName;
private String laboratoryContainerName;
private String warehouseContainerCode;
private String laboratoryContainerCode;
-
+
private String operatestateName;
private String operateState;
-
+ private String receiptNumber;
+ private String note;
+ //人员信息
+ private String project;
+ private String phone;
+ private String department;
+ private Integer applyNum;
+
+
public String getWarehouseContainerCode() {
@@ -229,4 +243,62 @@
public void setStoreType(StoreType storeType) {
this.storeType = storeType;
}
+
+ public String getReceiptNumber() {
+ return receiptNumber;
+ }
+
+ public void setReceiptNumber(String receiptNumber) {
+ this.receiptNumber = receiptNumber;
+ }
+
+
+
+ public Integer getApplyNum() {
+ return applyNum;
+ }
+
+ public void setApplyNum(Integer applyNum) {
+ this.applyNum = applyNum;
+ }
+
+ public String getProject() {
+ return project;
+ }
+
+ public void setProject(String project) {
+ this.project = project;
+ }
+
+ public String getDepartment() {
+ return department;
+ }
+
+ public void setDepartment(String department) {
+ this.department = department;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getNote() {
+ return note;
+ }
+
+ public void setNote(String note) {
+ this.note = note;
+ }
+
+ public BigDecimal getVolume() {
+ return volume;
+ }
+
+ public void setVolume(BigDecimal volume) {
+ this.volume = volume;
+ }
}
--
Gitblit v1.9.2