From f7d2f20365467a834188edd35c464d9fb9349214 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期五, 23 十二月 2022 08:53:43 +0800
Subject: [PATCH] 安全物资和设备管理调整v2

---
 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