From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 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 03d5367..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
@@ -9,7 +9,6 @@
import java.io.Serializable;
import java.math.BigDecimal;
-import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -26,7 +25,7 @@
@ApiModelProperty(value = "璁惧鍚嶇О")
private String deviceName;
- @ValueTableShow(value = 2, name = "en璁惧鍚嶇О")
+ @ValueTableShow(value = 2, name = "璁惧鍚嶇ОEN")
@ApiModelProperty(value = "en璁惧鍚嶇О")
private String enDeviceName;
@@ -53,7 +52,7 @@
@ValueTableShow(8)
@ApiModelProperty(value = "璐疆鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private String acquisitionDate;
+ private LocalDateTime acquisitionDate;
@ValueTableShow(value = 9, name = "鍚敤鏃ユ湡")
@ApiModelProperty(value = "鍚敤鏃ユ湡")
@@ -97,7 +96,7 @@
private Integer deviceStatus;
@ValueTableShow(20)
- @ApiModelProperty(value = "鏍″噯鍛ㄦ湡锛堟湀锛�")
+ @ApiModelProperty(value = "鏍″噯鍛ㄦ湡(鏈�)")
private String calibrationDate;
@ApiModelProperty(value = "鍥剧墖涓婁紶")
@@ -119,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