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/vo/InsOrderPlanVO.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
index 1cd93c8..5806b7d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
@@ -10,11 +10,14 @@
private String id;
- @ValueTableShow(value = 1,name = "濮旀墭缂栧彿")
+ @ValueTableShow(value = 1,name = "濮旀墭缂栧彿",width = 180)
private String entrustCode;
- @ValueTableShow(value = 2,name = "鏍峰搧绫诲瀷")
- private String sampleType;
+ @ValueTableShow(value = 2,name = "鏍峰搧缂栧彿")
+ private String sampleCode;
+
+ @ValueTableShow(value = 3,name = "鏍峰搧鍚嶇О")
+ private String sample;
@ValueTableShow(value = 4,name = "绱ф�ョ▼搴�")
private String type;
@@ -22,8 +25,22 @@
@ValueTableShow(value = 5,name = "鐘舵��")
private String insState;
- @ValueTableShow(value = 8,name = "妫�楠岀粨鏋�")
- private Integer insResult;
+ @ValueTableShow(value = 5,name = "妫�楠屼汉")
+ private String userName;
+ @ValueTableShow(value = 5,name = "澶嶆牳浜�")
+ private String checkName;
+
+ private Integer userId;
+ private String userNameId;
+
+ @ValueTableShow(value = 6,name = "鎶ユ鏃堕棿")
+ private String createTime;
+
+ @ValueTableShow(value = 8,name = "妫�楠屽紑濮嬫椂闂�")
+ private String insTime;
+
+ @ValueTableShow(value = 9,name = "妫�楠岀粨鏉熸椂闂�")
+ private String submitTime;
@ValueTableShow(value = 6,name = "绾﹀畾鏃堕棿")
private String appointed;
@@ -31,8 +48,22 @@
@ValueTableShow(value = 7,name = "涓嬪彂鏃堕棿")
private String sendTime;
- private Integer userId;
+ @ValueTableShow(value = 10,name = "鐞嗙敱")
+ private String verifyTell;
private String sonLaboratory;
+ private Integer orderUserId;
+
+ private Integer sampleId;
+
+ private Integer verifyUser;
+
+ private Integer orderStateId;
+
+ private Integer sort;
+ private Integer version;
+ private Integer num1;
+ private Integer isOut;
+
}
--
Gitblit v1.9.3