From 2f3a995359fd14e9450df2dc3fde05c0bf74e3af Mon Sep 17 00:00:00 2001 From: liuchengqian Date: Wed, 2 Mar 2022 13:54:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Qo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xkrs/model/qo/DataSourceQo.java | 29 ++++++++++++++----- src/main/java/com/xkrs/model/qo/FileQo.java | 14 ++++----- .../java/com/xkrs/model/qo/FileUpdateQo.java | 14 ++++----- .../java/com/xkrs/model/qo/PictureQo.java | 27 ++++++++++++----- src/main/java/com/xkrs/model/qo/SpecQo.java | 28 +++++++++++++----- 5 files changed, 77 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/xkrs/model/qo/DataSourceQo.java b/src/main/java/com/xkrs/model/qo/DataSourceQo.java index 7c42c7f..69727ed 100644 --- a/src/main/java/com/xkrs/model/qo/DataSourceQo.java +++ b/src/main/java/com/xkrs/model/qo/DataSourceQo.java @@ -35,10 +35,10 @@ public class DataSourceQo { private String modelNo; /** - * 零件号 + * 机种号 */ - @NotBlank(message = "{DataSource.partNo.blank}", groups = {DataSourceQoInsert.class}) - private String partNo; + @NotBlank(message = "{DataSource.machineTypeNo.blank}", groups = {DataSourceQoInsert.class}) + private String machineTypeNo; /** * 检验项代码 @@ -46,6 +46,12 @@ public class DataSourceQo { @NotBlank(message = "{DataSource.inspectionItemCode.blank}", groups = {DataSourceQoInsert.class}) private String inspectionItemCode; + /** + * 工艺项目名称 + */ + @NotBlank(message = "{DataSource.craftItemName.blank}", groups = {DataSourceQoInsert.class}) + private String craftItemName; + /** * 检验数值 */ @@ -87,12 +93,12 @@ public class DataSourceQo { this.modelNo = modelNo; } - public String getPartNo() { - return partNo; + public String getMachineTypeNo() { + return machineTypeNo; } - public void setPartNo(String partNo) { - this.partNo = partNo; + public void setMachineTypeNo(String machineTypeNo) { + this.machineTypeNo = machineTypeNo; } public String getInspectionItemCode() { @@ -103,6 +109,14 @@ public class DataSourceQo { this.inspectionItemCode = inspectionItemCode; } + public String getCraftItemName() { + return craftItemName; + } + + public void setCraftItemName(String craftItemName) { + this.craftItemName = craftItemName; + } + public String getInspectValue() { return inspectValue; } @@ -110,4 +124,5 @@ public class DataSourceQo { public void setInspectValue(String inspectValue) { this.inspectValue = inspectValue; } + } diff --git a/src/main/java/com/xkrs/model/qo/FileQo.java b/src/main/java/com/xkrs/model/qo/FileQo.java index f1676d1..7f9e7d1 100644 --- a/src/main/java/com/xkrs/model/qo/FileQo.java +++ b/src/main/java/com/xkrs/model/qo/FileQo.java @@ -35,10 +35,10 @@ public class FileQo { private String modelNo; /** - * 零件号 + * 机种号 */ - @NotBlank(message = "{FileEntity.partNo.blank}", groups = {FileQoInsert.class}) - private String partNo; + @NotBlank(message = "{FileEntity.machineTypeNo.blank}", groups = {FileQoInsert.class}) + private String machineTypeNo; /** * 上传模板的路径 @@ -81,12 +81,12 @@ public class FileQo { this.modelNo = modelNo; } - public String getPartNo() { - return partNo; + public String getMachineTypeNo() { + return machineTypeNo; } - public void setPartNo(String partNo) { - this.partNo = partNo; + public void setMachineTypeNo(String machineTypeNo) { + this.machineTypeNo = machineTypeNo; } public String getFileUploadPath() { diff --git a/src/main/java/com/xkrs/model/qo/FileUpdateQo.java b/src/main/java/com/xkrs/model/qo/FileUpdateQo.java index d681616..6a9840a 100644 --- a/src/main/java/com/xkrs/model/qo/FileUpdateQo.java +++ b/src/main/java/com/xkrs/model/qo/FileUpdateQo.java @@ -36,10 +36,10 @@ public class FileUpdateQo { private String modelNo; /** - * 零件号 + * 机种号 */ - @NotBlank(message = "{FileEntity.partNo.blank}", groups = {FileUpdateQoUpdate.class}) - private String partNo; + @NotBlank(message = "{FileEntity.machineTypeNo.blank}", groups = {FileUpdateQoUpdate.class}) + private String machineTypeNo; public FileUpdateQo() { } @@ -76,11 +76,11 @@ public class FileUpdateQo { this.modelNo = modelNo; } - public String getPartNo() { - return partNo; + public String getMachineTypeNo() { + return machineTypeNo; } - public void setPartNo(String partNo) { - this.partNo = partNo; + public void setMachineTypeNo(String machineTypeNo) { + this.machineTypeNo = machineTypeNo; } } diff --git a/src/main/java/com/xkrs/model/qo/PictureQo.java b/src/main/java/com/xkrs/model/qo/PictureQo.java index ad7a310..c8efaa7 100644 --- a/src/main/java/com/xkrs/model/qo/PictureQo.java +++ b/src/main/java/com/xkrs/model/qo/PictureQo.java @@ -31,10 +31,16 @@ public class PictureQo { private String modelNo; /** - * 零件号 + * 机种号 */ - @NotBlank(message = "{PictureEntity.partNo.blank}", groups = {PictureQoInsert.class}) - private String partNo; + @NotBlank(message = "{PictureEntity.machineTypeNo.blank}", groups = {PictureQoInsert.class}) + private String machineTypeNo; + + /** + * 工艺项目名称 + */ + @NotBlank(message = "{PictureEntity.craftItemName.blank}", groups = {PictureQoInsert.class}) + private String craftItemName; public PictureQo() { } @@ -71,12 +77,19 @@ public class PictureQo { this.modelNo = modelNo; } - public String getPartNo() { - return partNo; + public String getMachineTypeNo() { + return machineTypeNo; } - public void setPartNo(String partNo) { - this.partNo = partNo; + public void setMachineTypeNo(String machineTypeNo) { + this.machineTypeNo = machineTypeNo; } + public String getCraftItemName() { + return craftItemName; + } + + public void setCraftItemName(String craftItemName) { + this.craftItemName = craftItemName; + } } diff --git a/src/main/java/com/xkrs/model/qo/SpecQo.java b/src/main/java/com/xkrs/model/qo/SpecQo.java index 6984bc1..fe4ebdd 100644 --- a/src/main/java/com/xkrs/model/qo/SpecQo.java +++ b/src/main/java/com/xkrs/model/qo/SpecQo.java @@ -7,10 +7,10 @@ import javax.validation.constraints.NotBlank; public class SpecQo { /** - * 零件号 + * 机种号 */ - @NotBlank(message = "{SpecEntity.partNo.blank}", groups = {SpecQoInsert.class}) - private String partNo; + @NotBlank(message = "{SpecEntity.machineTypeNo.blank}", groups = {SpecQoInsert.class}) + private String machineTypeNo; /** * 检验项代码 @@ -18,6 +18,12 @@ public class SpecQo { @NotBlank(message = "{SpecEntity.inspectionItemCode.blank}", groups = {SpecQoInsert.class}) private String inspectionItemCode; + /** + * 工艺项目名称 + */ + @NotBlank(message = "{SpecEntity.craftItemName.blank}", groups = {SpecQoInsert.class}) + private String craftItemName; + /** * 最大值 */ @@ -62,12 +68,12 @@ public class SpecQo { public SpecQo() { } - public String getPartNo() { - return partNo; + public String getMachineTypeNo() { + return machineTypeNo; } - public void setPartNo(String partNo) { - this.partNo = partNo; + public void setMachineTypeNo(String machineTypeNo) { + this.machineTypeNo = machineTypeNo; } public String getInspectionItemCode() { @@ -78,6 +84,14 @@ public class SpecQo { this.inspectionItemCode = inspectionItemCode; } + public String getCraftItemName() { + return craftItemName; + } + + public void setCraftItemName(String craftItemName) { + this.craftItemName = craftItemName; + } + public String getMax() { return max; }