This commit is contained in:
liuchengqian 2022-03-02 13:54:24 +08:00
parent ed25c2b5fb
commit 2f3a995359
5 changed files with 77 additions and 35 deletions

View File

@ -35,10 +35,10 @@ public class DataSourceQo {
private String modelNo; private String modelNo;
/** /**
* 零件 * 机种
*/ */
@NotBlank(message = "{DataSource.partNo.blank}", groups = {DataSourceQoInsert.class}) @NotBlank(message = "{DataSource.machineTypeNo.blank}", groups = {DataSourceQoInsert.class})
private String partNo; private String machineTypeNo;
/** /**
* 检验项代码 * 检验项代码
@ -46,6 +46,12 @@ public class DataSourceQo {
@NotBlank(message = "{DataSource.inspectionItemCode.blank}", groups = {DataSourceQoInsert.class}) @NotBlank(message = "{DataSource.inspectionItemCode.blank}", groups = {DataSourceQoInsert.class})
private String inspectionItemCode; private String inspectionItemCode;
/**
* 工艺项目名称
*/
@NotBlank(message = "{DataSource.craftItemName.blank}", groups = {DataSourceQoInsert.class})
private String craftItemName;
/** /**
* 检验数值 * 检验数值
*/ */
@ -87,12 +93,12 @@ public class DataSourceQo {
this.modelNo = modelNo; this.modelNo = modelNo;
} }
public String getPartNo() { public String getMachineTypeNo() {
return partNo; return machineTypeNo;
} }
public void setPartNo(String partNo) { public void setMachineTypeNo(String machineTypeNo) {
this.partNo = partNo; this.machineTypeNo = machineTypeNo;
} }
public String getInspectionItemCode() { public String getInspectionItemCode() {
@ -103,6 +109,14 @@ public class DataSourceQo {
this.inspectionItemCode = inspectionItemCode; this.inspectionItemCode = inspectionItemCode;
} }
public String getCraftItemName() {
return craftItemName;
}
public void setCraftItemName(String craftItemName) {
this.craftItemName = craftItemName;
}
public String getInspectValue() { public String getInspectValue() {
return inspectValue; return inspectValue;
} }
@ -110,4 +124,5 @@ public class DataSourceQo {
public void setInspectValue(String inspectValue) { public void setInspectValue(String inspectValue) {
this.inspectValue = inspectValue; this.inspectValue = inspectValue;
} }
} }

View File

@ -35,10 +35,10 @@ public class FileQo {
private String modelNo; private String modelNo;
/** /**
* 零件 * 机种
*/ */
@NotBlank(message = "{FileEntity.partNo.blank}", groups = {FileQoInsert.class}) @NotBlank(message = "{FileEntity.machineTypeNo.blank}", groups = {FileQoInsert.class})
private String partNo; private String machineTypeNo;
/** /**
* 上传模板的路径 * 上传模板的路径
@ -81,12 +81,12 @@ public class FileQo {
this.modelNo = modelNo; this.modelNo = modelNo;
} }
public String getPartNo() { public String getMachineTypeNo() {
return partNo; return machineTypeNo;
} }
public void setPartNo(String partNo) { public void setMachineTypeNo(String machineTypeNo) {
this.partNo = partNo; this.machineTypeNo = machineTypeNo;
} }
public String getFileUploadPath() { public String getFileUploadPath() {

View File

@ -36,10 +36,10 @@ public class FileUpdateQo {
private String modelNo; private String modelNo;
/** /**
* 零件 * 机种
*/ */
@NotBlank(message = "{FileEntity.partNo.blank}", groups = {FileUpdateQoUpdate.class}) @NotBlank(message = "{FileEntity.machineTypeNo.blank}", groups = {FileUpdateQoUpdate.class})
private String partNo; private String machineTypeNo;
public FileUpdateQo() { public FileUpdateQo() {
} }
@ -76,11 +76,11 @@ public class FileUpdateQo {
this.modelNo = modelNo; this.modelNo = modelNo;
} }
public String getPartNo() { public String getMachineTypeNo() {
return partNo; return machineTypeNo;
} }
public void setPartNo(String partNo) { public void setMachineTypeNo(String machineTypeNo) {
this.partNo = partNo; this.machineTypeNo = machineTypeNo;
} }
} }

View File

@ -31,10 +31,16 @@ public class PictureQo {
private String modelNo; private String modelNo;
/** /**
* 零件 * 机种
*/ */
@NotBlank(message = "{PictureEntity.partNo.blank}", groups = {PictureQoInsert.class}) @NotBlank(message = "{PictureEntity.machineTypeNo.blank}", groups = {PictureQoInsert.class})
private String partNo; private String machineTypeNo;
/**
* 工艺项目名称
*/
@NotBlank(message = "{PictureEntity.craftItemName.blank}", groups = {PictureQoInsert.class})
private String craftItemName;
public PictureQo() { public PictureQo() {
} }
@ -71,12 +77,19 @@ public class PictureQo {
this.modelNo = modelNo; this.modelNo = modelNo;
} }
public String getPartNo() { public String getMachineTypeNo() {
return partNo; return machineTypeNo;
} }
public void setPartNo(String partNo) { public void setMachineTypeNo(String machineTypeNo) {
this.partNo = partNo; this.machineTypeNo = machineTypeNo;
} }
public String getCraftItemName() {
return craftItemName;
}
public void setCraftItemName(String craftItemName) {
this.craftItemName = craftItemName;
}
} }

View File

@ -7,10 +7,10 @@ import javax.validation.constraints.NotBlank;
public class SpecQo { public class SpecQo {
/** /**
* 零件 * 机种
*/ */
@NotBlank(message = "{SpecEntity.partNo.blank}", groups = {SpecQoInsert.class}) @NotBlank(message = "{SpecEntity.machineTypeNo.blank}", groups = {SpecQoInsert.class})
private String partNo; private String machineTypeNo;
/** /**
* 检验项代码 * 检验项代码
@ -18,6 +18,12 @@ public class SpecQo {
@NotBlank(message = "{SpecEntity.inspectionItemCode.blank}", groups = {SpecQoInsert.class}) @NotBlank(message = "{SpecEntity.inspectionItemCode.blank}", groups = {SpecQoInsert.class})
private String inspectionItemCode; private String inspectionItemCode;
/**
* 工艺项目名称
*/
@NotBlank(message = "{SpecEntity.craftItemName.blank}", groups = {SpecQoInsert.class})
private String craftItemName;
/** /**
* 最大值 * 最大值
*/ */
@ -62,12 +68,12 @@ public class SpecQo {
public SpecQo() { public SpecQo() {
} }
public String getPartNo() { public String getMachineTypeNo() {
return partNo; return machineTypeNo;
} }
public void setPartNo(String partNo) { public void setMachineTypeNo(String machineTypeNo) {
this.partNo = partNo; this.machineTypeNo = machineTypeNo;
} }
public String getInspectionItemCode() { public String getInspectionItemCode() {
@ -78,6 +84,14 @@ public class SpecQo {
this.inspectionItemCode = inspectionItemCode; this.inspectionItemCode = inspectionItemCode;
} }
public String getCraftItemName() {
return craftItemName;
}
public void setCraftItemName(String craftItemName) {
this.craftItemName = craftItemName;
}
public String getMax() { public String getMax() {
return max; return max;
} }