From 5325dfb2fda7bd21bcbcf3c8c10be1ac95793d86 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 05 八月 2024 20:40:48 +0800
Subject: [PATCH] 检验下单的委托人如果制单人的委托单位与选择的委托单位不一致,则委托人必须要进行填写,如果一致那么委托人就默认是制单人+.检验设备第一次进来直接所有样品的这个项目全部使用该设备，第二次修改就只针对当前样品
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 f339927..2237bc8 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
@@ -119,24 +119,28 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty(value = "IP")
- private String ip;
+ @ApiModelProperty("鏁伴噰-鏂囦欢鍚庣紑")
+ private String fileType;
- @ApiModelProperty(value = "閲囬泦鍦板潃")
+ @ApiModelProperty("鏁伴噰-閲囬泦鍦板潃")
private String collectUrl;
- @ApiModelProperty(value = "瀛樺偍鍦板潃")
+ @ApiModelProperty("鏁伴噰-瀛樺偍鍦板潃")
private String storageUrl;
- @ApiModelProperty(value = "鍙傜収")
- private String refer;
+ @ApiModelProperty("鏁伴噰-璁惧IP")
+ private String ip;
- @ApiModelProperty(value = "X")
- private String x;
+ @ApiModelProperty("鏁伴噰-鏄惁涓烘暟閲囪澶�")
+ @TableField(exist = false)
+ private Boolean isItADataAcquisitionDevice;
- @ApiModelProperty(value = "Y")
- private String y;
+ @ApiModelProperty("鏁伴噰-濮旀墭瀛楁")
+ private String entrustCode;
- @ApiModelProperty(value = "鍏紡")
- private String formula;
+ @ApiModelProperty("鏁伴噰-鏍峰搧瀛楁")
+ private String sampleCode;
+
+ @ApiModelProperty("鏁伴噰-db锛宮db鏂囦欢鍚嶇О")
+ private String dbFileName;
}
--
Gitblit v1.9.3