From 5bd5f3bcd6d2cb375feb0756505691b551339716 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期五, 23 十二月 2022 08:55:23 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

---
 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDetailInfoDO.java |  261 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 261 insertions(+), 0 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDetailInfoDO.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDetailInfoDO.java
new file mode 100644
index 0000000..7669f3b
--- /dev/null
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDetailInfoDO.java
@@ -0,0 +1,261 @@
+package com.gkhy.safePlatform.equipment.entity;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+public class SafeMaterialDetailInfoDO {
+    /**
+     * 主键
+     */
+    private Long id;
+    /**
+     * 物资名称
+     */
+    private String name;
+    /**
+     * 物资编号
+     */
+    private String materialNo;
+    private Long smallClassifyId;
+    /**
+     * 物资类型id
+     */
+    private Long bigClassifyId;
+    /**
+     * 物资类型名称
+     */
+    private String bigClassifyName;
+    /**
+     * RFID
+     */
+    private String rfid;
+    /**
+     * 是否是耗材（0是， 1否）
+     */
+    private Byte consumable;
+    /**
+     * 部门名称
+     *
+     */
+    private String depName;
+    /**
+     * 部门id
+     */
+    private Long depId;
+    /**
+     * 保质期类型
+     */
+    private Byte validType;
+    /**
+     * 保质到期时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date validTime;
+    /**
+     * 状态
+     */
+    private Byte validStatus;
+
+    private Byte status;
+
+    private String remark;
+    /**
+     * 出入库状态
+     */
+    private Byte irStatus;
+    /**
+     *  入库时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime wareHousingTime;
+    /**
+     * 出库时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime deliveryTime;
+    /**
+     * 安全物资字表id
+     */
+    private Long smId;
+    /**
+     * 认领人id
+     */
+    private Long receiveUid;
+
+    /**
+     * 认领人姓名
+     */
+    private String receiveUname;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getMaterialNo() {
+        return materialNo;
+    }
+
+    public void setMaterialNo(String materialNo) {
+        this.materialNo = materialNo;
+    }
+
+    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 String getRfid() {
+        return rfid;
+    }
+
+    public void setRfid(String rfid) {
+        this.rfid = rfid;
+    }
+
+    public Byte getConsumable() {
+        return consumable;
+    }
+
+    public void setConsumable(Byte consumable) {
+        this.consumable = consumable;
+    }
+
+    public String getDepName() {
+        return depName;
+    }
+
+    public void setDepName(String depName) {
+        this.depName = depName;
+    }
+
+    public Long getDepId() {
+        return depId;
+    }
+
+    public void setDepId(Long depId) {
+        this.depId = depId;
+    }
+
+    public Byte getValidType() {
+        return validType;
+    }
+
+    public void setValidType(Byte validType) {
+        this.validType = validType;
+    }
+
+    public Date getValidTime() {
+        return validTime;
+    }
+
+    public void setValidTime(Date validTime) {
+        this.validTime = validTime;
+    }
+
+    public Byte getValidStatus() {
+        return validStatus;
+    }
+
+    public void setValidStatus(Byte validStatus) {
+        this.validStatus = validStatus;
+    }
+
+    public Byte getIrStatus() {
+        return irStatus;
+    }
+
+    public void setIrStatus(Byte irStatus) {
+        this.irStatus = irStatus;
+    }
+
+    public LocalDateTime getWareHousingTime() {
+        return wareHousingTime;
+    }
+
+    public void setWareHousingTime(LocalDateTime wareHousingTime) {
+        this.wareHousingTime = wareHousingTime;
+    }
+
+    public LocalDateTime getDeliveryTime() {
+        return deliveryTime;
+    }
+
+    public void setDeliveryTime(LocalDateTime deliveryTime) {
+        this.deliveryTime = deliveryTime;
+    }
+
+    public Long getSmId() {
+        return smId;
+    }
+
+    public void setSmId(Long smId) {
+        this.smId = smId;
+    }
+
+
+    public Long getSmallClassifyId() {
+        return smallClassifyId;
+    }
+
+    public void setSmallClassifyId(Long smallClassifyId) {
+        this.smallClassifyId = smallClassifyId;
+    }
+
+    public Long getReceiveUid() {
+        return receiveUid;
+    }
+
+    public void setReceiveUid(Long receiveUid) {
+        this.receiveUid = receiveUid;
+    }
+
+    public String getReceiveUname() {
+        return receiveUname;
+    }
+
+    public void setReceiveUname(String receiveUname) {
+        this.receiveUname = receiveUname;
+    }
+
+    public Byte getStatus() {
+        return status;
+    }
+
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}

--
Gitblit v1.9.2