From a3f47b5e065878e5f41699ac1c597fd9ac9c4a21 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 14:56:24 +0800
Subject: [PATCH] 修改3.0   9.25

---
 inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java |   44 +++++++++++++++++++++++++-------------------
 1 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java
index ce5224f..faf4a3e 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java
@@ -1,5 +1,6 @@
 package com.yuanchu.mom.pojo.vo;
 
+import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -8,59 +9,66 @@
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
 @Data
-//鏌ヨ妫�楠屽崟璇︽儏(妫�楠屽熀鏈俊鎭互鍙婃楠岄」鐩俊鎭�)
+//鏂板鍘熸潗鏂欐楠屽崟鍙傛暟
 public class RawInspectVo implements Serializable {
-    
+
     /* 妫�楠岃鎯� */
     /**
      * 鏉ユ枡鏃ユ湡
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date formTime;
+    @NotNull(message = "鏉ユ枡鏃ユ湡涓嶈兘涓虹┖!")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private DateTime formTime;
 
     /**
      * 鍨嬪彿瑙勬牸
      */
+    @NotBlank(message = "鍨嬪彿瑙勬牸涓嶈兘涓虹┖!")
     @JsonSerialize
     private String specifications;
 
     /**
      * 鍘熸潗鏂欑紪鐮�
      */
+    @NotBlank(message = "鍘熸潗鏂欑紪鐮佷笉鑳戒负绌�!")
     @JsonSerialize
     private String code;
 
     /**
      * 鍘熸潗鏂欏悕绉�
      */
+    @NotBlank(message = "鍘熸潗鏂欏悕绉颁笉鑳戒负绌�!")
     @JsonSerialize
     private String name;
 
-    /**
-     * 鎶ユ鏃ユ湡
-     */
-    @TableField(fill = FieldFill.INSERT)
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date createTime;
 
     /**
      * 鍗曚綅
      */
+    @NotBlank(message = "鍗曚綅涓嶈兘涓虹┖!")
     @JsonSerialize
     private String unit;
 
     /**
      * 鏁伴噺
      */
+    @NotNull(message = "鏁伴噺涓嶈兘涓虹┖!")
     @JsonSerialize
     private Integer number;
+
+    /**
+     * 渚涘簲鍟�
+     */
+    @NotBlank(message = "渚涘簲鍟嗕笉鑳戒负绌�!")
+    private String supplier;
 
     /**
      * 鎶ユ浜猴紙褰撳墠鐢ㄦ埛鍚嶏級
@@ -68,14 +76,12 @@
     @JsonSerialize
     private String userName;
 
+    /**
+     * IFS涓鐗╂枡鐨勫叾浠栦俊鎭�
+     */
+    private String message;
+
     /* 妫�楠岄」鐩� */
     @JsonSerialize
     private List<RawInsProductVo> rawInsProducts;
-
-    /* 妫�楠岀粨璁� */
-    /**
-     * 鍚堟牸鐘舵�� 0锛氫笉鍚堟牸锛�1锛氬悎鏍�
-     */
-    @JsonSerialize
-    private Integer judgeState;
 }

--
Gitblit v1.9.3