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/model/dto/resp/MaterialReceiveRecordsDto.java |  193 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 193 insertions(+), 0 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/MaterialReceiveRecordsDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/MaterialReceiveRecordsDto.java
new file mode 100644
index 0000000..7f06ff6
--- /dev/null
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/MaterialReceiveRecordsDto.java
@@ -0,0 +1,193 @@
+package com.gkhy.safePlatform.equipment.model.dto.resp;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalDateTime;
+
+public class MaterialReceiveRecordsDto {
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    /**
+     * 物资名称
+     */
+    private String materialName;
+    /**
+     * 物资编号
+     */
+    private String materialNo;
+    /**
+     * rfid
+     */
+    private String rfid;
+    /**
+     * 领取时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime receiveTime;
+    /**
+     * 领取人id
+     */
+    private Long receiveUid;
+    /**
+     * 领取人姓名
+     */
+    private String receiveUname;
+    /**
+     * 归还状态(0未归还,1归还,3损耗)
+     */
+    private Byte revertStatus;
+    /**
+     * 归还状态
+     */
+    private String revertStatusName;
+    /**
+     * 物资状态
+     */
+    private Byte materialStatus;
+    /**
+     * 物资状态
+     */
+    private String materialStatusName;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 归还时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime revertTime;
+
+    /**
+     * 物资清单(详细物资)id
+     */
+    private Long smdId;
+    /**
+     * 基础记录id
+     */
+    private Long receiveBaseId;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
+    public String getMaterialNo() {
+        return materialNo;
+    }
+
+    public void setMaterialNo(String materialNo) {
+        this.materialNo = materialNo;
+    }
+
+    public String getRfid() {
+        return rfid;
+    }
+
+    public void setRfid(String rfid) {
+        this.rfid = rfid;
+    }
+
+    public LocalDateTime getReceiveTime() {
+        return receiveTime;
+    }
+
+    public void setReceiveTime(LocalDateTime receiveTime) {
+        this.receiveTime = receiveTime;
+    }
+
+    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 getRevertStatus() {
+        return revertStatus;
+    }
+
+    public void setRevertStatus(Byte revertStatus) {
+        this.revertStatus = revertStatus;
+    }
+
+    public String getRevertStatusName() {
+        return revertStatusName;
+    }
+
+    public void setRevertStatusName(String revertStatusName) {
+        this.revertStatusName = revertStatusName;
+    }
+
+    public Byte getMaterialStatus() {
+        return materialStatus;
+    }
+
+    public void setMaterialStatus(Byte materialStatus) {
+        this.materialStatus = materialStatus;
+    }
+
+    public String getMaterialStatusName() {
+        return materialStatusName;
+    }
+
+    public void setMaterialStatusName(String materialStatusName) {
+        this.materialStatusName = materialStatusName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public LocalDateTime getRevertTime() {
+        return revertTime;
+    }
+
+    public void setRevertTime(LocalDateTime revertTime) {
+        this.revertTime = revertTime;
+    }
+
+    public Long getSmdId() {
+        return smdId;
+    }
+
+    public void setSmdId(Long smdId) {
+        this.smdId = smdId;
+    }
+
+    public Long getReceiveBaseId() {
+        return receiveBaseId;
+    }
+
+    public void setReceiveBaseId(Long receiveBaseId) {
+        this.receiveBaseId = receiveBaseId;
+    }
+}

--
Gitblit v1.9.2