From e2dba648a958d3f9181b0556c941f14d07477a64 Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期五, 10 五月 2024 17:34:49 +0800
Subject: [PATCH] 辅助工时单位字段修改和不合格品bug修改
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
index 3c2d821..7141bcc 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
@@ -34,12 +34,18 @@
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String entrustCode;
+ @ValueTableShow(2)
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty(value = "妫�楠岀被鍒�")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String orderType;
+
/**
* 涓嬪崟瀹㈡埛
*/
@ValueTableShow(3)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("涓嬪崟瀹㈡埛")
+ @ApiModelProperty("濮旀墭瀹㈡埛")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String custom;
@@ -48,9 +54,15 @@
*/
@ValueTableShow(4)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("涓嬪崟鍗曚綅")
+ @ApiModelProperty("濮旀墭鍗曚綅")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String company;
+
+ @ValueTableShow(4)
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("鑱旂郴鏂瑰紡")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String phone;
/**
* 宸ュ巶鍩�
@@ -71,10 +83,22 @@
* 绾﹀畾鏃堕棿
*/
@ValueTableShow(7)
- @ApiModelProperty("闇�姹傛椂闂�")
+ @ApiModelProperty("绾﹀畾鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate appointed;
+
+// @ValueTableShow(7)
+ @ApiModelProperty("妫�楠岀粨鏋�")
+ private Integer insResult;
+
+ @ValueTableShow(7)
+ @ApiModelProperty("鏍峰搧澶勭悊鏂瑰紡")
+ private Integer processing;
+
+ @ValueTableShow(7)
+ @ApiModelProperty("鏄惁鐣欐牱")
+ private Integer isLeave;
/**
* 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
@@ -112,6 +136,12 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
+ @ValueTableShow(13)
+ @ApiModelProperty("涓嬪彂鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime sendTime;
+
/**
*
*/
@@ -131,4 +161,43 @@
private Integer mating;
+ @ApiModelProperty("妫�楠岀姸鎬�(0锛氬緟妫�楠� 1:妫�楠屼腑 2:宸叉楠� 3锛氬緟澶嶆牳 4锛氬鏍告湭閫氳繃 5锛氬鏍搁�氳繃)")
+ private Integer insState;
+
+ /**
+ * 妫�楠屽伐鍘�
+ */
+ private String factory;
+
+ /**
+ * 瀹為獙瀹ゅ悕绉�
+ */
+ private String laboratory;
+
+ /**
+ * 鏍峰搧绫诲瀷
+ */
+ private String sampleType;
+
+ /**
+ * 鏍峰搧鍚嶇О
+ */
+ private String sample;
+
+ @ApiModelProperty("妫�楠屾椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime insTime;
+
+ @ValueTableShow(value = 14, name = "閫�鍥炵悊鐢�")
+ private String tell;
+
+ @ValueTableShow(value = 15, name = "鎶ュ憡鍙戦�佹柟寮�")
+ private Integer send;
+
+ @ValueTableShow(value = 16, name = "鏉ユ牱鏂瑰紡")
+ private String formType;
+ @TableField(exist = false)
+ @ApiModelProperty("瀹℃牳鏃堕棿")
+ private LocalDateTime examineTime;
+
}
--
Gitblit v1.9.3