From e776dcaa5aa2416634644c2c7ac333ee95738b95 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 17 三月 2025 15:57:31 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-after
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 204 +++++++++++++++++++++++++++-----------------------
1 files changed, 109 insertions(+), 95 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
index 236bdbd..e8fb98e 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
@@ -8,6 +8,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -20,113 +21,89 @@
@TableId(type = IdType.AUTO)
private Integer id;
- @ValueTableShow(2)
- @ApiModelProperty(value = "澶х被")
- private String largeCategory;
-
- @ValueTableShow(3)
- @ApiModelProperty(value = "鍑哄巶鏃ユ湡")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private String dateProduction;
-
- @ValueTableShow(4)
- @ApiModelProperty(value = "璁惧璐熻矗浜�")
- private String equipmentManager;
-
- @ValueTableShow(5)
- @ApiModelProperty(value = "琚巿鏉冧汉")
- private String authorizedPerson;
-
- @ValueTableShow(6)
+ @ValueTableShow(1)
@ApiModelProperty(value = "璁惧鍚嶇О")
private String deviceName;
- @ValueTableShow(7)
- @ApiModelProperty(value = "鍐呴儴缂栫爜")
- private String internalCode;
+ @ValueTableShow(value = 2, name = "璁惧鍚嶇ОEN")
+ @ApiModelProperty(value = "en璁惧鍚嶇О")
+ private String enDeviceName;
- @ValueTableShow(8)
- @ApiModelProperty(value = "璧勪骇缂栫爜")
- private String assetCode;
-
- @ValueTableShow(9)
- @ApiModelProperty(value = "鏍″噯鏃ユ湡锛堟湀锛�")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime calibrationDate;
-
- @ValueTableShow(10)
- @ApiModelProperty(value = "鎶ュ簾鏃ユ湡")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime scrapTime;
-
- @ValueTableShow(11)
- @ApiModelProperty(value = "楠屾敹璁板綍")
- private String acceptanceRecords;
-
- @ValueTableShow(12)
- @ApiModelProperty(value = "缁嗙被")
- private String subclass;
-
- @ValueTableShow(13)
- @ApiModelProperty(value = "鍑哄巶缂栧彿")
- private String factoryNo;
-
- @ValueTableShow(14)
- @ApiModelProperty(value = "璐疆鏃ユ湡")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private String acquisitionDate;
-
- @ValueTableShow(15)
- @ApiModelProperty(value = "鍑嗙‘搴﹂噺鍊�")
- private String accurateMeasurement;
-
- @ValueTableShow(16)
+ @ValueTableShow(3)
@ApiModelProperty(value = "瑙勬牸鍨嬪彿")
private String specificationModel;
- @ValueTableShow(17)
- @ApiModelProperty(value = "璁惧鐘舵��")
- private String deviceStatus;
-
- @ValueTableShow(18)
- @ApiModelProperty(value = "瀛樻斁鐐�")
- private String storagePoint;
-
- @ValueTableShow(19)
- @ApiModelProperty(value = "鏈�杩戣拷婧棩鏈�")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime latestTraceability;
-
- @ValueTableShow(20)
- @ApiModelProperty(value = "鍋滅敤鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime downTime;
-
- @ValueTableShow(21)
- @ApiModelProperty(value = "缁翠慨璁板綍")
- private String maintenanceRecords;
-
- @ValueTableShow(22)
+ @ValueTableShow(4)
@ApiModelProperty(value = "鐢熶骇鍘傚")
private String manufacturer;
- @ValueTableShow(23)
- @ApiModelProperty(value = "妫�娴嬬被鍨�")
- private String detectionType;
+ @ValueTableShow(5)
+ @ApiModelProperty(value = "鍑哄巶缂栧彿")
+ private String factoryNo;
- @ValueTableShow(24)
- @ApiModelProperty(value = "閲囪喘璐圭敤")
- private String procurementCosts;
+ @ValueTableShow(value = 6, name = "绠＄悊缂栧彿")
+ @ApiModelProperty(value = "绠＄悊缂栧彿")
+ private String managementNumber;
- @ValueTableShow(25)
- @ApiModelProperty(value = "鏍″噯璇佷功")
- private String calibrationCerticate;
+ @ValueTableShow(value = 7, name = "鎶�鏈寚鏍�")
+ @ApiModelProperty(value = "鎶�鏈寚鏍�")
+ private String technicalIndicators;
+
+ @ValueTableShow(8)
+ @ApiModelProperty(value = "璐疆鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime acquisitionDate;
+
+ @ValueTableShow(value = 9, name = "鍚敤鏃ユ湡")
+ @ApiModelProperty(value = "鍚敤鏃ユ湡")
+ private LocalDateTime activationDate;
+
+ @ApiModelProperty(value = "绠＄悊浜篒d")
+ private Integer equipmentManager;
+
+ @ValueTableShow(11)
+ @ApiModelProperty(value = "瀛樻斁鐐�")
+ private String storagePoint;
+
+ @ApiModelProperty(value = "鎵�灞為儴闂↖d")
+ private Integer subordinateDepartmentsId;
+
+ @ApiModelProperty(value = "妫�楠岄」鐩甀d")
+ private String insProductIds;
+
+ @ValueTableShow(value = 14, name = "鏍″噯鏈嶅姟鏈烘瀯")
+ @ApiModelProperty(value = "鏍″噯鏈嶅姟鏈烘瀯")
+ private String calibrationServices;
+
+ @ValueTableShow(value = 15, name = "鏈�杩戞牎鍑嗘棩鏈�")
+ @ApiModelProperty(value = "鏈�杩戞牎鍑嗘棩鏈�")
+ private LocalDateTime lastCalibrationDate;
+
+ @ValueTableShow(value = 16, name = "涓嬫鏍″噯鏃ユ湡")
+ @ApiModelProperty(value = "涓嬫鏍″噯鏃ユ湡")
+ private LocalDateTime nextCalibrationDate;
+
+ @ValueTableShow(value = 17, name = "璁惧鍒嗙被")
+ @ApiModelProperty(value = "璁惧绫诲瀷")
+ private String largeCategory;
+
+ @ValueTableShow(value = 18, name = "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
+ private BigDecimal unitPrice;
+
+ @ValueTableShow(19)
+ @ApiModelProperty(value = "璁惧鐘舵��")
+ private Integer deviceStatus;
+
+ @ValueTableShow(20)
+ @ApiModelProperty(value = "鏍″噯鍛ㄦ湡(鏈�)")
+ private String calibrationDate;
+
+ @ApiModelProperty(value = "鍥剧墖涓婁紶")
+ private String imageUpload;
+
+ @ApiModelProperty(value = "鍥剧墖澶囨敞")
+ private String imageName;
@ApiModelProperty(value = "鍒涘缓浜篿d")
@TableField(fill = FieldFill.INSERT)
@@ -141,4 +118,41 @@
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
+
+ @ApiModelProperty("鏁伴噰-鏂囦欢鍚庣紑")
+ private String fileType;
+
+ @ApiModelProperty("鏁伴噰-閲囬泦鍦板潃")
+ private String collectUrl;
+
+ @ApiModelProperty("鏁伴噰-瀛樺偍鍦板潃")
+ private String storageUrl;
+
+ @ApiModelProperty("鏁伴噰-璁惧IP")
+ private String ip;
+
+ @ApiModelProperty("鏁伴噰-鏄惁涓烘暟閲囪澶�")
+ @TableField(exist = false)
+ private Boolean isItADataAcquisitionDevice;
+
+ @ApiModelProperty("鏁伴噰-濮旀墭瀛楁")
+ private String entrustCode;
+
+ @ApiModelProperty("鏁伴噰-鏍峰搧瀛楁")
+ private String sampleCode;
+
+ @ApiModelProperty("鏁伴噰-db锛宮db鏂囦欢鍚嶇О")
+ private String dbFileName;
+
+ @ApiModelProperty("琚巿鏉冧汉")
+ private String authorizedPerson;
+
+ @ApiModelProperty("璧勪骇缂栫爜")
+ private String assetCode;
+
+ @ApiModelProperty("浜у湴")
+ private String origin;
+
+ @ApiModelProperty("杞欢鐗堟湰")
+ private String version;
}
--
Gitblit v1.9.3