From 53e7dce8d55487cbac64e4374ec9aa1b52a6c6ed Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期四, 09 三月 2023 21:16:43 +0800
Subject: [PATCH] 解决npe问题

---
 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/SafeMaterialDto.java |   66 ++++++++++++++++++++++----------
 1 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/SafeMaterialDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/SafeMaterialDto.java
index 4bd30ce..c9c14bc 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/SafeMaterialDto.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/SafeMaterialDto.java
@@ -16,9 +16,11 @@
     /**
      * 物资类型id
      */
-    private Long materialClassifyId;
+    private Long bigClassifyId;
 
-    private String materialClassifyName;
+    private String bigClassifyName;
+
+    private Long smallClassifyId;
     /**
      * 部门id
      */
@@ -40,7 +42,13 @@
     /**
      * 有效库存数量
      */
-    private Integer validStockCount;
+    private Integer stockCount;
+
+    /**
+     * 总库存
+     * @return
+     */
+    private Integer totalCount;
 
     public Long getId() {
         return id;
@@ -58,21 +66,7 @@
         this.serialNum = serialNum;
     }
 
-    public Long getMaterialClassifyId() {
-        return materialClassifyId;
-    }
 
-    public void setMaterialClassifyId(Long materialClassifyId) {
-        this.materialClassifyId = materialClassifyId;
-    }
-
-    public String getMaterialClassifyName() {
-        return materialClassifyName;
-    }
-
-    public void setMaterialClassifyName(String materialClassifyName) {
-        this.materialClassifyName = materialClassifyName;
-    }
 
     public Long getDepId() {
         return depId;
@@ -114,13 +108,43 @@
         this.consumableName = consumableName;
     }
 
-    public Integer getValidStockCount() {
-        return validStockCount;
+    public Integer getStockCount() {
+        return stockCount;
     }
 
-    public void setValidStockCount(Integer validStockCount) {
-        this.validStockCount = validStockCount;
+    public void setStockCount(Integer stockCount) {
+        this.stockCount = stockCount;
     }
 
+    public Integer getTotalCount() {
+        return totalCount;
+    }
 
+    public void setTotalCount(Integer totalCount) {
+        this.totalCount = totalCount;
+    }
+
+    public Long getBigClassifyId() {
+        return bigClassifyId;
+    }
+
+    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;
+    }
 }

--
Gitblit v1.9.2