From 997f84ac06afee8a3819e20020f7e4ed0f82dae8 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 30 七月 2024 19:41:16 +0800
Subject: [PATCH] 检验下单的数据查看功能,里面的表头按照原始记录模版的样式描述,比如要求值改为试验要求,然后去掉实验室字段,单位字段靠前
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 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 fd3015c..df0c1ae 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
@@ -14,42 +14,41 @@
@ValueTableShow(name = "鏍峰搧缂栧彿")
private String sampleCode;
- @ValueTableShow(value = 2, name = "鏍峰搧鍚嶇О")
+ @ValueTableShow(value = 1, name = "鏍峰搧鍚嶇О")
private String sample;
- @ValueTableShow(value = 4, name = "鏍峰搧鍨嬪彿")
- private String model;
-
- @ValueTableShow(value = 5, name = "鏍峰搧鐘舵��")
- private Integer insState;
-
- @ValueTableShow(value = 15, name = "鍗曚綅")
- private String unit;
-
- @ValueTableShow(value = 7, name = "妫�楠岄」")
+ @ValueTableShow(value = 2, name = "妫�楠岄」")
private String inspectionItem;
- @ValueTableShow(value = 8, name = "妫�楠屽瓙椤�")
+ @ValueTableShow(value = 3, name = "妫�楠屽瓙椤�")
private String inspectionItemSubclass;
- @ValueTableShow(value = 17, name = "瀹為獙瀹�")
+ @ValueTableShow(value = 4, name = "鍗曚綅")
+ private String unit;
+
+ @ValueTableShow(value = 5, name = "鏍峰搧鍨嬪彿")
+ private String model;
+
+// @ValueTableShow(value = 5, name = "鏍峰搧鐘舵��")
+ private Integer insState;
+
+// @ValueTableShow(value = 17, name = "瀹為獙瀹�")
private String sonLaboratory;
private String inspectionItemType;
- @ValueTableShow(value = 11, name = "妫�楠屽�肩被鍨�")
+// @ValueTableShow(value = 11, name = "妫�楠屽�肩被鍨�")
private String inspectionValueType;
- @ValueTableShow(value = 12, name = "瑕佹眰鍊�")
+ @ValueTableShow(value = 12, name = "璇曢獙瑕佹眰")
private String ask;
- @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 = "璁惧")
private String equipValue;
}
--
Gitblit v1.9.3