From 9c77ac0ccf6a505ea91086094e83fd9f92f8ab87 Mon Sep 17 00:00:00 2001 From: liuchengqian Date: Sat, 12 Mar 2022 15:34:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BE=93=E5=85=A5=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=98=AF=E5=90=A6=E5=8F=AF=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/xkrs/model/qo/QcItemQoDelete.java | 5 +++++ src/main/java/com/xkrs/model/qo/QcItemQoInsert.java | 7 +++++++ src/main/java/com/xkrs/model/qo/QcItemQoUpdate.java | 6 ++++++ src/main/java/com/xkrs/model/qo/QcSourceQoDelete.java | 5 +++++ src/main/java/com/xkrs/model/qo/QcSourceQoInsert.java | 10 ++++++++++ src/main/java/com/xkrs/model/qo/QcSpecQoDelete.java | 5 +++++ src/main/java/com/xkrs/model/qo/QcSpecQoInsert.java | 6 ++++++ src/main/java/com/xkrs/model/qo/QcSpecQoUpdate.java | 5 +++++ src/main/java/com/xkrs/model/va/QcItemQoQueryVa.java | 4 ---- src/main/java/com/xkrs/model/va/QcSourceQoQueryVa.java | 4 ---- src/main/java/com/xkrs/model/va/QcSpecQoQueryVa.java | 4 ---- 11 files changed, 49 insertions(+), 12 deletions(-) delete mode 100644 src/main/java/com/xkrs/model/va/QcItemQoQueryVa.java delete mode 100644 src/main/java/com/xkrs/model/va/QcSourceQoQueryVa.java delete mode 100644 src/main/java/com/xkrs/model/va/QcSpecQoQueryVa.java diff --git a/src/main/java/com/xkrs/model/qo/QcItemQoDelete.java b/src/main/java/com/xkrs/model/qo/QcItemQoDelete.java index 7bbe38b..a5636cf 100644 --- a/src/main/java/com/xkrs/model/qo/QcItemQoDelete.java +++ b/src/main/java/com/xkrs/model/qo/QcItemQoDelete.java @@ -1,5 +1,9 @@ package com.xkrs.model.qo; +import com.xkrs.model.va.QcItemQoDeleteVa; + +import javax.validation.constraints.NotBlank; + /** * 删除检验项目接收类 */ @@ -8,6 +12,7 @@ public class QcItemQoDelete { /** * 主键id */ + @NotBlank(message = "{QcItemEntity.id.blank}", groups = {QcItemQoDeleteVa.class}) private Integer id; public QcItemQoDelete() { diff --git a/src/main/java/com/xkrs/model/qo/QcItemQoInsert.java b/src/main/java/com/xkrs/model/qo/QcItemQoInsert.java index 2195ee0..3affe2d 100644 --- a/src/main/java/com/xkrs/model/qo/QcItemQoInsert.java +++ b/src/main/java/com/xkrs/model/qo/QcItemQoInsert.java @@ -1,5 +1,9 @@ package com.xkrs.model.qo; +import com.xkrs.model.va.QcItemQoInsertVa; + +import javax.validation.constraints.NotBlank; + /** * 新增检验项目接收类 */ @@ -8,16 +12,19 @@ public class QcItemQoInsert { /** * 编号 */ + @NotBlank(message = "{QcItemEntity.no.blank}", groups = {QcItemQoInsertVa.class}) private String no; /** * 名称 */ + @NotBlank(message = "{QcItemEntity.name.blank}", groups = {QcItemQoInsertVa.class}) private String name; /** * 类型 */ + @NotBlank(message = "{QcItemEntity.type.blank}", groups = {QcItemQoInsertVa.class}) private String type; public QcItemQoInsert() { diff --git a/src/main/java/com/xkrs/model/qo/QcItemQoUpdate.java b/src/main/java/com/xkrs/model/qo/QcItemQoUpdate.java index fbe0142..fab1957 100644 --- a/src/main/java/com/xkrs/model/qo/QcItemQoUpdate.java +++ b/src/main/java/com/xkrs/model/qo/QcItemQoUpdate.java @@ -1,5 +1,9 @@ package com.xkrs.model.qo; +import com.xkrs.model.va.QcItemQoUpdateVa; + +import javax.validation.constraints.NotBlank; + /** * 更新检验项目接收类 */ @@ -8,11 +12,13 @@ public class QcItemQoUpdate { /** * 主键id */ + @NotBlank(message = "{QcItemEntity.id.blank}", groups = {QcItemQoUpdateVa.class}) private Integer id; /** * 名称 */ + @NotBlank(message = "{QcItemEntity.name.blank}", groups = {QcItemQoUpdateVa.class}) private String name; public QcItemQoUpdate() { diff --git a/src/main/java/com/xkrs/model/qo/QcSourceQoDelete.java b/src/main/java/com/xkrs/model/qo/QcSourceQoDelete.java index 8bd47b3..122ed71 100644 --- a/src/main/java/com/xkrs/model/qo/QcSourceQoDelete.java +++ b/src/main/java/com/xkrs/model/qo/QcSourceQoDelete.java @@ -1,5 +1,9 @@ package com.xkrs.model.qo; +import com.xkrs.model.va.QcSourceQoDeleteVa; + +import javax.validation.constraints.NotBlank; + /** * 删除检验数据接收类 */ @@ -8,6 +12,7 @@ public class QcSourceQoDelete { /** * 主键id */ + @NotBlank(message = "{QcSourceEntity.id.blank}", groups = {QcSourceQoDeleteVa.class}) private Integer id; public QcSourceQoDelete() { diff --git a/src/main/java/com/xkrs/model/qo/QcSourceQoInsert.java b/src/main/java/com/xkrs/model/qo/QcSourceQoInsert.java index f4eff09..5825309 100644 --- a/src/main/java/com/xkrs/model/qo/QcSourceQoInsert.java +++ b/src/main/java/com/xkrs/model/qo/QcSourceQoInsert.java @@ -1,5 +1,9 @@ package com.xkrs.model.qo; +import com.xkrs.model.va.QcSourceQoInsertVa; + +import javax.validation.constraints.NotBlank; + /** * 新增检验数据接收类 */ @@ -8,31 +12,37 @@ public class QcSourceQoInsert { /** * 批次号 */ + @NotBlank(message = "{QcSourceEntity.batchNo.blank}", groups = {QcSourceQoInsertVa.class}) private String batchNo; /** * 机器号 */ + @NotBlank(message = "{QcSourceEntity.machineNo.blank}", groups = {QcSourceQoInsertVa.class}) private String machineNo; /** * 物料号 */ + @NotBlank(message = "{QcSourceEntity.materialNo.blank}", groups = {QcSourceQoInsertVa.class}) private String materialNo; /** * 模具号 */ + @NotBlank(message = "{QcSourceEntity.mouldNo.blank}", groups = {QcSourceQoInsertVa.class}) private String mouldNo; /** * 机种号 */ + @NotBlank(message = "{QcSourceEntity.varietyNo.blank}", groups = {QcSourceQoInsertVa.class}) private String varietyNo; /** * 检验项目编号 */ + @NotBlank(message = "{QcSourceEntity.qcItemNo.blank}", groups = {QcSourceQoInsertVa.class}) private String qcItemNo; /** diff --git a/src/main/java/com/xkrs/model/qo/QcSpecQoDelete.java b/src/main/java/com/xkrs/model/qo/QcSpecQoDelete.java index a6931c2..77e5557 100644 --- a/src/main/java/com/xkrs/model/qo/QcSpecQoDelete.java +++ b/src/main/java/com/xkrs/model/qo/QcSpecQoDelete.java @@ -1,5 +1,9 @@ package com.xkrs.model.qo; +import com.xkrs.model.va.QcSpecQoDeleteVa; + +import javax.validation.constraints.NotBlank; + /** * 删除检验规格接收类 */ @@ -8,6 +12,7 @@ public class QcSpecQoDelete { /** * 主键id */ + @NotBlank(message = "{QcSpecEntity.id.blank}", groups = {QcSpecQoDeleteVa.class}) private Integer id; public QcSpecQoDelete() { diff --git a/src/main/java/com/xkrs/model/qo/QcSpecQoInsert.java b/src/main/java/com/xkrs/model/qo/QcSpecQoInsert.java index 4a27626..5e1fa86 100644 --- a/src/main/java/com/xkrs/model/qo/QcSpecQoInsert.java +++ b/src/main/java/com/xkrs/model/qo/QcSpecQoInsert.java @@ -1,5 +1,9 @@ package com.xkrs.model.qo; +import com.xkrs.model.va.QcSpecQoInsertVa; + +import javax.validation.constraints.NotBlank; + /** * 新增检验规格接收类 */ @@ -8,11 +12,13 @@ public class QcSpecQoInsert { /** * 机种号 */ + @NotBlank(message = "{QcSpecEntity.varietyNo.blank}", groups = {QcSpecQoInsertVa.class}) private String varietyNo; /** * 检验项目编号 */ + @NotBlank(message = "{QcSpecEntity.qcItemNo.blank}", groups = {QcSpecQoInsertVa.class}) private String qcItemNo; /** diff --git a/src/main/java/com/xkrs/model/qo/QcSpecQoUpdate.java b/src/main/java/com/xkrs/model/qo/QcSpecQoUpdate.java index af6f451..0ba273c 100644 --- a/src/main/java/com/xkrs/model/qo/QcSpecQoUpdate.java +++ b/src/main/java/com/xkrs/model/qo/QcSpecQoUpdate.java @@ -1,5 +1,9 @@ package com.xkrs.model.qo; +import com.xkrs.model.va.QcSpecQoUpdateVa; + +import javax.validation.constraints.NotBlank; + /** * 更新检验规格接收类 */ @@ -8,6 +12,7 @@ public class QcSpecQoUpdate { /** * 主键id */ + @NotBlank(message = "{QcSpecEntity.id.blank}", groups = {QcSpecQoUpdateVa.class}) private Integer id; /** diff --git a/src/main/java/com/xkrs/model/va/QcItemQoQueryVa.java b/src/main/java/com/xkrs/model/va/QcItemQoQueryVa.java deleted file mode 100644 index 5cba403..0000000 --- a/src/main/java/com/xkrs/model/va/QcItemQoQueryVa.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.xkrs.model.va; - -public interface QcItemQoQueryVa { -} diff --git a/src/main/java/com/xkrs/model/va/QcSourceQoQueryVa.java b/src/main/java/com/xkrs/model/va/QcSourceQoQueryVa.java deleted file mode 100644 index 0939456..0000000 --- a/src/main/java/com/xkrs/model/va/QcSourceQoQueryVa.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.xkrs.model.va; - -public interface QcSourceQoQueryVa { -} diff --git a/src/main/java/com/xkrs/model/va/QcSpecQoQueryVa.java b/src/main/java/com/xkrs/model/va/QcSpecQoQueryVa.java deleted file mode 100644 index 7f87dad..0000000 --- a/src/main/java/com/xkrs/model/va/QcSpecQoQueryVa.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.xkrs.model.va; - -public interface QcSpecQoQueryVa { -}