liuchengqian/industrial_measurement
Archived
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改entity，partNo-->machineTypeNo,添加craftItemName

Browse Source
This commit is contained in:
liuchengqian
2022-03-02 11:59:09 +08:00
parent 2a362c3264
commit ed25c2b5fb
5 changed files with 115 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/xkrs/model/entity/DataDict.java
View File

@@ -59,7 +59,10 @@ public class DataDict {
@Override
public String toString() {
return "DataDict{" + "id=" + id + ", inspectionItemCode='" + inspectionItemCode + '\'' + ", inspectionItemName='" + inspectionItemName + '\'' + '}';
return "DataDict{" +
"id=" + id +
", inspectionItemCode='" + inspectionItemCode + '\'' +
", inspectionItemName='" + inspectionItemName + '\'' +
'}';
}
}

38
src/main/java/com/xkrs/model/entity/DataSource.java
View File

@@ -43,10 +43,10 @@ public class DataSource {
private String modelNo;
/**
* 零件号
* 机种号
*/
@Column(length = 85, columnDefinition = "varchar(85)")
private String partNo;
private String machineTypeNo;
/**
* 检验项代码
@@ -54,6 +54,12 @@ public class DataSource {
@Column(length = 85, columnDefinition = "varchar(85)")
private String inspectionItemCode;
/**
* 工艺项目名称
*/
@Column(length = 85, columnDefinition = "varchar(85)")
private String craftItemName;
/**
* 检验数值
*/
@@ -103,12 +109,12 @@ public class DataSource {
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() {
@@ -119,6 +125,14 @@ public class DataSource {
this.inspectionItemCode = inspectionItemCode;
}
public String getCraftItemName() {
return craftItemName;
}
public void setCraftItemName(String craftItemName) {
this.craftItemName = craftItemName;
}
public String getInspectValue() {
return inspectValue;
}
@@ -129,6 +143,16 @@ public class DataSource {
@Override
public String toString() {
return "DataSource{" + "id=" + id + ", lotNo='" + lotNo + '\'' + ", machineNo='" + machineNo + '\'' + ", materialNo='" + materialNo + '\'' + ", modelNo='" + modelNo + '\'' + ", partNo='" + partNo + '\'' + ", inspectionItemCode='" + inspectionItemCode + '\'' + ", inspectValue='" + inspectValue + '\'' + '}';
return "DataSource{" +
"id=" + id +
", lotNo='" + lotNo + '\'' +
", machineNo='" + machineNo + '\'' +
", materialNo='" + materialNo + '\'' +
", modelNo='" + modelNo + '\'' +
", machineTypeNo='" + machineTypeNo + '\'' +
", inspectionItemCode='" + inspectionItemCode + '\'' +
", craftItemName='" + craftItemName + '\'' +
", inspectValue='" + inspectValue + '\'' +
'}';
}
}

23
src/main/java/com/xkrs/model/entity/FileEntity.java
View File

@@ -42,10 +42,10 @@ public class FileEntity {
private String modelNo;
/**
* 零件号
* 机种号
*/
@Column(length = 85, columnDefinition = "varchar(85)")
private String partNo;
private String machineTypeNo;
/**
* 上传模板的路径
@@ -102,12 +102,12 @@ public class FileEntity {
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() {
@@ -128,6 +128,15 @@ public class FileEntity {
@Override
public String toString() {
return "FileEntity{" + "id=" + id + ", lotNo='" + lotNo + '\'' + ", machineNo='" + machineNo + '\'' + ", materialNo='" + materialNo + '\'' + ", modelNo='" + modelNo + '\'' + ", partNo='" + partNo + '\'' + ", fileUploadPath='" + fileUploadPath + '\'' + ", fileDownloadPath='" + fileDownloadPath + '\'' + '}';
return "FileEntity{" +
"id=" + id +
", lotNo='" + lotNo + '\'' +
", machineNo='" + machineNo + '\'' +
", materialNo='" + materialNo + '\'' +
", modelNo='" + modelNo + '\'' +
", machineTypeNo='" + machineTypeNo + '\'' +
", fileUploadPath='" + fileUploadPath + '\'' +
", fileDownloadPath='" + fileDownloadPath + '\'' +
'}';
}
}

37
src/main/java/com/xkrs/model/entity/PictureEntity.java
View File

@@ -38,10 +38,16 @@ public class PictureEntity {
private String modelNo;
/**
* 零件号
* 机种号
*/
@Column(length = 85, columnDefinition = "varchar(85)")
private String partNo;
private String machineTypeNo;
/**
* 工艺项目名称
*/
@Column(length = 85, columnDefinition = "varchar(85)")
private String craftItemName;
/**
* 图片路径
@@ -92,12 +98,20 @@ public class PictureEntity {
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;
}
public String getPicturePath() {
@@ -110,6 +124,15 @@ public class PictureEntity {
@Override
public String toString() {
return "PictureEntity{" + "id=" + id + ", lotNo='" + lotNo + '\'' + ", machineNo='" + machineNo + '\'' + ", materialNo='" + materialNo + '\'' + ", modelNo='" + modelNo + '\'' + ", partNo='" + partNo + '\'' + ", picturePath='" + picturePath + '\'' + '}';
return "PictureEntity{" +
"id=" + id +
", lotNo='" + lotNo + '\'' +
", machineNo='" + machineNo + '\'' +
", materialNo='" + materialNo + '\'' +
", modelNo='" + modelNo + '\'' +
", machineTypeNo='" + machineTypeNo + '\'' +
", craftItemName='" + craftItemName + '\'' +
", picturePath='" + picturePath + '\'' +
'}';
}
}

40
src/main/java/com/xkrs/model/entity/SpecEntity.java
View File

@@ -14,10 +14,10 @@ public class SpecEntity {
private Integer id;
/**
* 零件号
* 机种号
*/
@Column(length = 85, columnDefinition = "varchar(85)")
private String partNo;
private String machineTypeNo;
/**
* 检验项代码
@@ -25,6 +25,12 @@ public class SpecEntity {
@Column(length = 85, columnDefinition = "varchar(85)")
private String inspectionItemCode;
/**
* 工艺项目名称
*/
@Column(length = 85, columnDefinition = "varchar(85)")
private String craftItemName;
/**
* 最大值
*/
@@ -78,12 +84,12 @@ public class SpecEntity {
this.id = id;
}
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() {
@@ -94,6 +100,14 @@ public class SpecEntity {
this.inspectionItemCode = inspectionItemCode;
}
public String getCraftItemName() {
return craftItemName;
}
public void setCraftItemName(String craftItemName) {
this.craftItemName = craftItemName;
}
public String getMax() {
return max;
}
@@ -152,6 +166,18 @@ public class SpecEntity {
@Override
public String toString() {
return "SpecEntity{" + "id=" + id + ", partNo='" + partNo + '\'' + ", inspectionItemCode='" + inspectionItemCode + '\'' + ", max='" + max + '\'' + ", mean='" + mean + '\'' + ", min='" + min + '\'' + ", unit='" + unit + '\'' + ", inspectionMethod='" + inspectionMethod + '\'' + ", inspectionStandard='" + inspectionStandard + '\'' + ", remark='" + remark + '\'' + '}';
return "SpecEntity{" +
"id=" + id +
", machineTypeNo='" + machineTypeNo + '\'' +
", inspectionItemCode='" + inspectionItemCode + '\'' +
", craftItemName='" + craftItemName + '\'' +
", max='" + max + '\'' +
", mean='" + mean + '\'' +
", min='" + min + '\'' +
", unit='" + unit + '\'' +
", inspectionMethod='" + inspectionMethod + '\'' +
", inspectionStandard='" + inspectionStandard + '\'' +
", remark='" + remark + '\'' +
'}';
}
}