From cc59b65bc63b839127c29775bcd410dd407de66d Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 21 四月 2025 17:20:02 +0800
Subject: [PATCH] 设备采购计划与设备照片

---
 platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.java |   63 +++++++++++++++++++++++++++++--
 1 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.java
index 0aea09c..c911c60 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.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
@@ -28,23 +31,75 @@
 	/**
 	 * 楠屾敹涓昏〃Id
 	 */
-	@Column(columnDefinition="long comment '楠屾敹涓昏〃Id'")
+	@Column(columnDefinition="bigint comment '楠屾敹涓昏〃Id'")
 	private Long noteId;
+
 	/**
 	 * 鍚堝悓Id
 	 */
-	@Column(columnDefinition="long comment '鍚堝悓瀛愰」Id'")
+	@Column(columnDefinition="bigint comment '鍚堝悓瀛愰」Id'")
 	private Long contractItemId;
 
 	@Schema(description = "鏁伴噺")
-	@Column(columnDefinition="long comment '鏁伴噺'")
-	private Long num;
+	@Column(columnDefinition="integer comment '鏁伴噺'")
+	private Integer num;
+
 	/**
 	 * 楠屾敹閲戦
 	 */
+	@TableField("`output`")
 	@Column(columnDefinition="double comment '楠屾敹閲戦'")
 	private Double output;
 
+	/**
+	 * 璁惧ID
+	 */
+	@Schema(description="璁惧ID")
+	@Column(columnDefinition="bigint comment '璁惧ID'")
+	private Long deviceId;
 
+	/**
+	 * 璁惧缂栫爜
+	 */
+	@Schema(description="璁惧缂栫爜")
+	@Column(columnDefinition="VARCHAR(16) comment '璁惧缂栫爜'")
+	private String deviceCode;
+
+	/**
+	 * 璁惧鍚嶇О
+	 */
+	@Schema(description="璁惧鍚嶇О")
+	@Column(columnDefinition="VARCHAR(256) comment '璁惧鍚嶇О'")
+	private String deviceName;
+
+	/**
+	 * 瑙勬牸鍨嬪彿
+	 */
+	@Schema(description="瑙勬牸鍨嬪彿")
+	@Column(columnDefinition="VARCHAR(256) comment '瑙勬牸鍨嬪彿'")
+	private String deviceModels;
+
+	/**
+	 * 鍏抽敭鍙傛暟
+	 */
+	@Schema(description="鍏抽敭鍙傛暟")
+	@Column(columnDefinition="VARCHAR(256) comment '鍏抽敭鍙傛暟'")
+	private String keyParameter;
+
+
+	/**
+	 * 璁￠噺鍗曚綅
+	 */
+	@Schema(description="璁￠噺鍗曚綅")
+	@Column(columnDefinition="VARCHAR(32) comment '璁￠噺鍗曚綅'")
+	private String meteringUnit;
+
+
+	/**
+	 * 璁惧搴忓垪鍙�
+	 */
+	@Schema(description="璁惧搴忓垪鍙� 閫楀彿鍒嗛殧")
+	@Column(columnDefinition="VARCHAR(256) comment '璁惧搴忓垪鍙�'")
+	private String serialNos;
 
 }

--
Gitblit v1.9.1