From 97bb7a8832281eafe0ef947ea095258d355e52f5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 30 十二月 2024 15:57:51 +0800
Subject: [PATCH] 无源器件的数采+电路模版查询
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 750ee10..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
@@ -1,9 +1,12 @@
package com.yuanchu.mom.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.pojo.InsOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.List;
/**
* @author gaoaoy
@@ -13,27 +16,36 @@
@Data
public class SampleOrderDto extends InsOrder {
- @ValueTableShow(5)
@ApiModelProperty("妫�楠屽璞�")
private String sampleType;
- @ValueTableShow(6)
+ @ValueTableShow(3)
@ApiModelProperty("鏍峰搧鍚嶇О")
private String sampleName;
- @ValueTableShow(6)
+ @ValueTableShow(4)
@ApiModelProperty("鏍峰搧鍨嬪彿")
private String sampleModel;
- @ValueTableShow(6)
+ 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;
+ private List<ReportDto> reportDtos;
}
--
Gitblit v1.9.3