From 53e7dce8d55487cbac64e4374ec9aa1b52a6c6ed Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: Thu, 09 Mar 2023 21:16:43 +0800
Subject: [PATCH] 解决npe问题
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDO.java | 66 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 12 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDO.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDO.java
index 1930b44..3f0df27 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDO.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDO.java
@@ -20,9 +20,12 @@
/**
* 物资类型id
*/
- private Long materialClassifyId;
+ private Long bigClassifyId;
- private String materialClassifyName;
+ private String bigClassifyName;
+
+ private Long smallClassifyId;
+ private String smallClassifyName;
/**
* 部门id
*/
@@ -35,6 +38,11 @@
* 物资名称
*/
private String materialName;
+ /**
+ *
+ */
+ private Integer totalCount;
+ private Integer stockCount;
/**
* 是否是耗材（0是， 1否）
*/
@@ -94,13 +102,7 @@
this.serialNum = serialNum;
}
- public Long getMaterialClassifyId() {
- return materialClassifyId;
- }
- public void setMaterialClassifyId(Long materialClassifyId) {
- this.materialClassifyId = materialClassifyId;
- }
public Long getDepId() {
return depId;
@@ -190,11 +192,51 @@
this.updateTime = updateTime;
}
- public String getMaterialClassifyName() {
- return materialClassifyName;
+ public Long getBigClassifyId() {
+ return bigClassifyId;
}
- public void setMaterialClassifyName(String materialClassifyName) {
- this.materialClassifyName = materialClassifyName;
+ public void setBigClassifyId(Long bigClassifyId) {
+ this.bigClassifyId = bigClassifyId;
+ }
+
+ public String getBigClassifyName() {
+ return bigClassifyName;
+ }
+
+ public void setBigClassifyName(String bigClassifyName) {
+ this.bigClassifyName = bigClassifyName;
+ }
+
+ public Long getSmallClassifyId() {
+ return smallClassifyId;
+ }
+
+ public void setSmallClassifyId(Long smallClassifyId) {
+ this.smallClassifyId = smallClassifyId;
+ }
+
+ public String getSmallClassifyName() {
+ return smallClassifyName;
+ }
+
+ public void setSmallClassifyName(String smallClassifyName) {
+ this.smallClassifyName = smallClassifyName;
+ }
+
+ public Integer getTotalCount() {
+ return totalCount;
+ }
+
+ public void setTotalCount(Integer totalCount) {
+ this.totalCount = totalCount;
+ }
+
+ public Integer getStockCount() {
+ return stockCount;
+ }
+
+ public void setStockCount(Integer stockCount) {
+ this.stockCount = stockCount;
}
}
--
Gitblit v1.9.2