From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示

---
 inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
index cb779c8..909b73d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
@@ -6,6 +6,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author gaoaoy
  * @version 1.0.0
@@ -25,25 +27,25 @@
     @ApiModelProperty("鏍峰搧鍨嬪彿")
     private String sampleModel;
 
+    private String assign;
+    private String name;
+
     @ValueTableShow(5)
     @ApiModelProperty("鏍峰搧鏁伴噺")
     private Integer sampleNum;
 
+    @ValueTableShow(3)
     @ApiModelProperty("鏍峰搧缂栧彿")
     private String sampleCode;
+
+    @ValueTableShow(3)
+    @ApiModelProperty("鐢垫満缂栧彿")
+    private String motorNumber;
 
     @ValueTableShow(7)
     @ApiModelProperty("妫�楠岃繘搴�%")
     private String insProgress;
 
-    @ApiModelProperty("鎶ュ憡id")
-    private String reportId;
-
-    @TableField("`url`")
-    private String url;
-
-    private String urlS;
-
-    private String name;
+   private List<ReportDto> reportDtos;
 
 }

--
Gitblit v1.9.3