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/SafeMaterialInfo.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialInfo.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialInfo.java
index b432ae3..76a9e62 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialInfo.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialInfo.java
@@ -20,9 +20,13 @@
*/
private String serialNum;
/**
- * 物资类型id
+ * 物资类型id 大类
*/
- private Long materialClassifyId;
+ private Long bigClassifyId;
+ /**
+ * 物资类型 小类
+ */
+ private Long smallClassifyId;
/**
* 部门id
*/
@@ -39,6 +43,14 @@
* 是否是耗材（0是， 1否）
*/
private Byte consumable;
+ /**
+ * 有效数量
+ */
+ private Integer totalCount;
+ /**
+ * 库存数量
+ */
+ private Integer stockCount;
/**
* 删除标识
*/
@@ -94,12 +106,20 @@
this.serialNum = serialNum;
}
- public Long getMaterialClassifyId() {
- return materialClassifyId;
+ public Long getBigClassifyId() {
+ return bigClassifyId;
}
- public void setMaterialClassifyId(Long materialClassifyId) {
- this.materialClassifyId = materialClassifyId;
+ public void setBigClassifyId(Long bigClassifyId) {
+ this.bigClassifyId = bigClassifyId;
+ }
+
+ public Long getSmallClassifyId() {
+ return smallClassifyId;
+ }
+
+ public void setSmallClassifyId(Long smallClassifyId) {
+ this.smallClassifyId = smallClassifyId;
}
public Long getDepId() {
@@ -190,5 +210,19 @@
this.updateTime = updateTime;
}
+ 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