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/MaterialReceiveRecordsBaseDto.java | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 174 insertions(+), 0 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/MaterialReceiveRecordsBaseDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/MaterialReceiveRecordsBaseDto.java
new file mode 100644
index 0000000..c2bc2c7
--- /dev/null
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/MaterialReceiveRecordsBaseDto.java
@@ -0,0 +1,174 @@
+package com.gkhy.safePlatform.equipment.model.dto.resp;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.time.LocalDateTime;
+import java.util.List;
+
+public class MaterialReceiveRecordsBaseDto {
+ /**
+ * 主键
+ */
+ private Long id;
+ /**
+ * 物资种类名称
+ */
+ private String materialName;
+
+ /**
+ * 领取人id
+ */
+ private Long receiveUid;
+
+ /**
+ * 领取人姓名
+ */
+ private String receiveUname;
+ /**
+ * 领取数量
+ */
+ private Integer receiveCount;
+ /**
+ * 归还数量
+ */
+ private Integer revertCount;
+ private Integer consumeCount;
+ /**
+ * 归还情况（0未归还，1部分归还，2归还完成，3耗材无需归还）
+ */
+ private Byte status;
+ /**
+ * 归还情况
+ */
+ private String statusName;
+
+ /**
+ * 物资管理id
+ */
+ private Long smId;
+
+ /**
+ * 创建时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ public LocalDateTime createTime;
+
+
+ private Long depId;
+
+ private String depName;
+
+ private List<MaterialReceiveRecordsDto> materialList;
+
+ 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 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 Integer getReceiveCount() {
+ return receiveCount;
+ }
+
+ public void setReceiveCount(Integer receiveCount) {
+ this.receiveCount = receiveCount;
+ }
+
+ public Integer getRevertCount() {
+ return revertCount;
+ }
+
+ public void setRevertCount(Integer revertCount) {
+ this.revertCount = revertCount;
+ }
+
+ public Byte getStatus() {
+ return status;
+ }
+
+ public void setStatus(Byte status) {
+ this.status = status;
+ }
+
+ public String getStatusName() {
+ return statusName;
+ }
+
+ public void setStatusName(String statusName) {
+ this.statusName = statusName;
+ }
+
+ public Long getSmId() {
+ return smId;
+ }
+
+ public void setSmId(Long smId) {
+ this.smId = smId;
+ }
+
+ public LocalDateTime getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(LocalDateTime createTime) {
+ this.createTime = createTime;
+ }
+
+ public Long getDepId() {
+ return depId;
+ }
+
+ public void setDepId(Long depId) {
+ this.depId = depId;
+ }
+
+ public String getDepName() {
+ return depName;
+ }
+
+ public void setDepName(String depName) {
+ this.depName = depName;
+ }
+
+ public List<MaterialReceiveRecordsDto> getMaterialList() {
+ return materialList;
+ }
+
+ public void setMaterialList(List<MaterialReceiveRecordsDto> materialList) {
+ this.materialList = materialList;
+ }
+
+ public Integer getConsumeCount() {
+ return consumeCount;
+ }
+
+ public void setConsumeCount(Integer consumeCount) {
+ this.consumeCount = consumeCount;
+ }
+}
--
Gitblit v1.9.2