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/SampleProductDto2.java | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
index 615c1a5..963c790 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
@@ -10,29 +10,30 @@
public class SampleProductDto2 extends OrderBy implements Serializable {
private Integer id;
+ private Integer insProductId;
@ValueTableShow(name = "鏍峰搧缂栧彿")
private String sampleCode;
- @ValueTableShow(value = 2, name = "鏍峰搧鍚嶇О")
+ @ValueTableShow(value = 1, name = "鏍峰搧鍚嶇О")
private String sample;
- @ValueTableShow(value = 4, name = "鏍峰搧鍨嬪彿")
+ @ValueTableShow(value = 2, name = "妫�楠岄」")
+ private String inspectionItem;
+
+ @ValueTableShow(value = 3, name = "妫�楠屽瓙椤�")
+ private String inspectionItemSubclass;
+
+ @ValueTableShow(value = 4, name = "鍗曚綅")
+ private String unit;
+
+ @ValueTableShow(value = 5, name = "鏍峰搧鍨嬪彿")
private String model;
// @ValueTableShow(value = 5, name = "鏍峰搧鐘舵��")
private Integer insState;
- @ValueTableShow(value = 15, name = "鍗曚綅")
- private String unit;
-
- @ValueTableShow(value = 7, name = "妫�楠岄」")
- private String inspectionItem;
-
- @ValueTableShow(value = 8, name = "妫�楠屽瓙椤�")
- private String inspectionItemSubclass;
-
- @ValueTableShow(value = 17, name = "瀹為獙瀹�")
+// @ValueTableShow(value = 17, name = "瀹為獙瀹�")
private String sonLaboratory;
private String inspectionItemType;
@@ -40,16 +41,21 @@
// @ValueTableShow(value = 11, name = "妫�楠屽�肩被鍨�")
private String inspectionValueType;
- @ValueTableShow(value = 12, name = "瑕佹眰鍊�")
- private String ask;
+ @ValueTableShow(value = 12, name = "璇曢獙瑕佹眰")
+ private String tell;
- @ValueTableShow(value = 13, name = "鏈�缁堝��")
+// @ValueTableShow(value = 13, name = "妫�楠岀粨鏋�")
private String lastValue;
- @ValueTableShow(value = 14, name = "鏄惁鍚堟牸")
+ @ValueTableShow(value = 14, name = "缁撴灉鍒ゅ畾")
private Integer insResult;
- @ValueTableShow(value = 16, name = "璁惧")
+ @ValueTableShow(value = 15, name = "妫�楠屼汉")
+ private String checkName;
+
+ @ValueTableShow(value = 16, name = "妫�楠屾棩鏈�")
+ private String checkTime;
+
private String equipValue;
}
--
Gitblit v1.9.3