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/dto/DeviceDto.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceDto.java b/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceDto.java
index 5963016..e140fc0 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceDto.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceDto.java
@@ -7,6 +7,8 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -23,4 +25,25 @@
     @ValueTableShow(13)
     @ApiModelProperty(value = "妫�楠岄」鐩�")
     private String insProductItem;
+
+
+    @ApiModelProperty(value = "绠$悊浜哄鍚�")
+    private String equipmentManagerName;
+
+    @ApiModelProperty(value = "琚巿鏉冧汉濮撳悕")
+    private String authorizedPersonName;
+
+    @ApiModelProperty(value = "鏍稿噯璇佷功缂栧彿")
+    private String calibrateNo;
+
+    @ValueTableShow(value = 15, name = "鏈�杩戞牎鍑嗘棩鏈�")
+    @ApiModelProperty(value = "鏈�杩戞牎鍑嗘棩鏈�")
+    private LocalDateTime lastCalibrationDateTwo;
+
+    @ValueTableShow(value = 16, name = "涓嬫鏍″噯鏃ユ湡")
+    @ApiModelProperty(value = "涓嬫鏍″噯鏃ユ湡")
+    private LocalDateTime nextCalibrationDateTwo;
+
+    @ApiModelProperty(value = "鏍″噯鎻愰啋")
+    private String status;
 }

--
Gitblit v1.9.3