From a7ad35b3e20867204cda9faa7bdf8a686264e906 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 27 三月 2025 17:17:43 +0800
Subject: [PATCH] 合同及明细业务调整
---
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java | 81 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 insertions(+), 0 deletions(-)
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java
index c96a2df..c192bac 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java
@@ -1,5 +1,6 @@
package com.by4cloud.platformx.device.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -10,7 +11,9 @@
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.Transient;
import java.util.Date;
+import java.util.List;
/**
* @author kdq
@@ -30,6 +33,13 @@
*/
@Column(columnDefinition="long comment '鍚堝悓Id'")
private Long contractId;
+
+// /**
+// * 绉熺敤鍚堝悓Id
+// */
+// @Column(columnDefinition="long comment '绉熺敤鍚堝悓Id'")
+// private Long rentContractId;
+
@Schema(description = "楠屾敹鍏徃")
@Column(columnDefinition="VARCHAR(64) comment '楠屾敹鍏徃'")
private String releaseCompName;
@@ -47,9 +57,80 @@
/**
* 鎬婚噾棰�
*/
+ @TableField("`output`")
@Column(columnDefinition="double comment '鎬婚噾棰�'")
private Double output;
+ @Schema(description = "楠屾敹鍗曠紪鍙�")
+ @Column(columnDefinition="VARCHAR(32) comment '楠屾敹鍗曠紪鍙�'")
+ private String releaseCode;
+ /**
+ * 鏉ユ簮绫诲瀷
+ */
+ @Schema(description = "鏉ユ簮绫诲瀷")
+ @Column(columnDefinition="INTEGER comment '鏉ユ簮绫诲瀷'")
+ private String resourceType;
+ /**
+ * 鐢熶骇鍘傚晢
+ */
+ @Schema(description = "鐢熶骇鍘傚晢")
+ @Column(columnDefinition="long comment '鐢熶骇鍘傚晢'")
+ private Long manufacturerId;
+
+ /**
+ * 鍑哄巶鏃ユ湡
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Schema(description = "鍑哄巶鏃ユ湡")
+ @Column(columnDefinition = "datetime comment '鍑哄巶鏃ユ湡'")
+ private Date productDate;
+
+ /**
+ * 楠屾敹鎯呭喌
+ */
+ @Schema(description = "楠屾敹鎯呭喌")
+ @Column(columnDefinition="VARCHAR(1024) comment '楠屾敹鎯呭喌'")
+ private String releaseSituation;
+
+ /**
+ * 鏁存敼鎯呭喌
+ */
+ @Schema(description = "鏁存敼鎯呭喌")
+ @Column(columnDefinition="VARCHAR(1024) comment '鏁存敼鎯呭喌'")
+ private String correctionSituation;
+
+ /**
+ * 楠屾敹缁撹
+ */
+ @Schema(description = "楠屾敹缁撹")
+ @Column(columnDefinition="VARCHAR(1024) comment '楠屾敹缁撹'")
+ private String releaseConclusion;
+
+ /**
+ * 妫�楠屾姤鍛�
+ */
+ @Schema(description = "妫�楠屾姤鍛�")
+ @Column(columnDefinition="VARCHAR(1024) comment '妫�楠屾姤鍛�'")
+ private String inspectionReport;
+
+ /**
+ * 澶囨敞
+ */
+ @Schema(description = "澶囨敞")
+ @Column(columnDefinition="VARCHAR(256) comment '澶囨敞'")
+ private String remarks;
+
+ /**
+ * 浣跨敤鍏徃
+ */
+// @Schema(description = "浣跨敤鍏徃")
+// @Column(columnDefinition="long comment '浣跨敤鍏徃'")
+// private Long deptId;
+
+ @Transient
+ @TableField(exist = false)
+ private List<ReceivingNoteItem> noteItemList;
}
--
Gitblit v1.9.1