diff --git a/src/main/java/com/xkrs/model/entity/DataSource.java b/src/main/java/com/xkrs/model/entity/DataSource.java index 4ab1966..4562324 100644 --- a/src/main/java/com/xkrs/model/entity/DataSource.java +++ b/src/main/java/com/xkrs/model/entity/DataSource.java @@ -7,71 +7,68 @@ import javax.persistence.*; * @Date: 2022/1/19 14:08 */ @Entity -@Table(name = "data_source") +@Table(name = "qc_inspection_data_source") public class DataSource { + /** * 主键id */ @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "data_source_seq_gen") - @SequenceGenerator(name = "data_source_seq_gen", sequenceName = "data_source_id_seq",allocationSize = 1) + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "qc_inspection_data_source_seq_gen") + @SequenceGenerator(name = "qc_inspection_data_source_seq_gen", sequenceName = "qc_inspection_data_source_id_seq", allocationSize = 1) private Integer id; /** - * 机种 - */ - @Column(length = 32, columnDefinition = "varchar(32)") - private String dataModelNumber; - - /** - * 成型批号 - */ - @Column(length = 32, columnDefinition = "varchar(32)") - private String dataBatchNumber; - - /** - * 机器 - */ - @Column(length = 32, columnDefinition = "varchar(32)") - private String dataMachineCode; - - /** - * 模具 - */ - @Column(length = 32, columnDefinition = "varchar(32)") - private String productNumber; - - /** - * 材料 - */ - private String material; - - /** - * 变量值 + * 批次号 */ @Column(length = 85, columnDefinition = "varchar(85)") - private String dataName; + private String lotNo; /** - * 监测的数值 + * 批次号 */ @Column(length = 85, columnDefinition = "varchar(85)") - private String numericalValue; + private String lotNo; + + /** + * 机器号 + */ + @Column(length = 85, columnDefinition = "varchar(85)") + private String machineNo; + + /** + * 物料号 + */ + @Column(length = 85, columnDefinition = "varchar(85)") + private String materialNo; + + /** + * 模具号 + */ + @Column(length = 85, columnDefinition = "varchar(85)") + private String modelNo; + + /** + * 零件号 + */ + @Column(length = 85, columnDefinition = "varchar(85)") + private String partNo; + + /** + * 检验项代码 + */ + @Column(length = 85, columnDefinition = "varchar(85)") + private String inspectionItemCode; + + /** + * 检验数值 + */ + @Column(length = 85, columnDefinition = "varchar(85)") + private String inspectValue; public DataSource() { } - public DataSource(Integer id, String dataModelNumber, String dataBatchNumber, String dataMachineCode, String productNumber, String material, String dataName, String numericalValue) { - this.id = id; - this.dataModelNumber = dataModelNumber; - this.dataBatchNumber = dataBatchNumber; - this.dataMachineCode = dataMachineCode; - this.productNumber = productNumber; - this.material = material; - this.dataName = dataName; - this.numericalValue = numericalValue; - } - public Integer getId() { return id; } @@ -80,73 +77,64 @@ public class DataSource { this.id = id; } - public String getDataModelNumber() { - return dataModelNumber; + public String getLotNo() { + return lotNo; } - public void setDataModelNumber(String dataModelNumber) { - this.dataModelNumber = dataModelNumber; + public void setLotNo(String lotNo) { + this.lotNo = lotNo; } - public String getDataBatchNumber() { - return dataBatchNumber; + public String getMachineNo() { + return machineNo; } - public void setDataBatchNumber(String dataBatchNumber) { - this.dataBatchNumber = dataBatchNumber; + public void setMachineNo(String machineNo) { + this.machineNo = machineNo; } - public String getDataMachineCode() { - return dataMachineCode; + public String getMaterialNo() { + return materialNo; } - public void setDataMachineCode(String dataMachineCode) { - this.dataMachineCode = dataMachineCode; + public void setMaterialNo(String materialNo) { + this.materialNo = materialNo; } - public String getProductNumber() { - return productNumber; + public String getModelNo() { + return modelNo; } - public void setProductNumber(String productNumber) { - this.productNumber = productNumber; + public void setModelNo(String modelNo) { + this.modelNo = modelNo; } - public String getMaterial() { - return material; + public String getPartNo() { + return partNo; } - public void setMaterial(String material) { - this.material = material; + public void setPartNo(String partNo) { + this.partNo = partNo; } - public String getDataName() { - return dataName; + public String getInspectionItemCode() { + return inspectionItemCode; } - public void setDataName(String dataName) { - this.dataName = dataName; + public void setInspectionItemCode(String inspectionItemCode) { + this.inspectionItemCode = inspectionItemCode; } - public String getNumericalValue() { - return numericalValue; + public String getInspectValue() { + return inspectValue; } - public void setNumericalValue(String numericalValue) { - this.numericalValue = numericalValue; + public void setInspectValue(String inspectValue) { + this.inspectValue = inspectValue; } @Override public String toString() { - return "DataSource{" + - "id=" + id + - ", dataModelNumber='" + dataModelNumber + '\'' + - ", dataBatchNumber='" + dataBatchNumber + '\'' + - ", dataMachineCode='" + dataMachineCode + '\'' + - ", productNumber='" + productNumber + '\'' + - ", material='" + material + '\'' + - ", dataName='" + dataName + '\'' + - ", numericalValue='" + numericalValue + '\'' + - '}'; + return "DataSource{" + "id=" + id + ", lotNo='" + lotNo + '\'' + ", lotNo='" + lotNo + '\'' + ", machineNo='" + machineNo + '\'' + ", materialNo='" + materialNo + '\'' + ", modelNo='" + modelNo + '\'' + ", partNo='" + partNo + '\'' + ", inspectionItemCode='" + inspectionItemCode + '\'' + ", inspectValue='" + inspectValue + '\'' + '}'; } }