更新数据表Entity

src/main/java/com/xkrs/model/entity/DataSource.java

@@ -24,12 +24,6 @@ public class DataSource {
     @Column(length = 85, columnDefinition = "varchar(85)")
     private String lotNo;
 
-    /**
-     * 批次号
-     */
-    @Column(length = 85, columnDefinition = "varchar(85)")
-    private String lotNo;
-
     /**
      * 机器号
      */
@@ -135,6 +129,6 @@ public class DataSource {
 
     @Override
     public String toString() {
-        return "DataSource{" + "id=" + id + ", lotNo='" + lotNo + '\'' + ", 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 + '\'' + ", partNo='" + partNo + '\'' + ", inspectionItemCode='" + inspectionItemCode + '\'' + ", inspectValue='" + inspectValue + '\'' + '}';
     }
 }

src/main/java/com/xkrs/model/entity/FileEntity.java

@@ -7,63 +7,61 @@ import javax.persistence.*;
  * @Date: 2022/1/20 15:01
  */
 @Entity
-@Table(name = "file")
+@Table(name = "qc_inspection_file")
 public class FileEntity {
     /**
      * 主键id
      */
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "file_seq_gen")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "qc_inspection_file_seq_gen")
-    @SequenceGenerator(name = "file_seq_gen", sequenceName = "file_id_seq",allocationSize = 1)
+    @SequenceGenerator(name = "qc_inspection_file_seq_gen", sequenceName = "qc_inspection_file_id_seq", allocationSize = 1)
     private Integer id;
 
-    /**
-     * 机种号
-     */
-    @Column(length = 32, columnDefinition = "varchar(32)")
-    private String fileModelNumber;
-
     /**
      * 批次号
      */
-    @Column(length = 32, columnDefinition = "varchar(32)")
+    @Column(length = 85, columnDefinition = "varchar(85)")
-    private String fileBatchNumber;
+    private String lotNo;
 
     /**
      * 机器号
      */
-    @Column(length = 32, columnDefinition = "varchar(32)")
+    @Column(length = 85, columnDefinition = "varchar(85)")
-    private String fileMachineCode;
+    private String machineNo;
 
     /**
-     * 产品编号
+     * 物料号
      */
-    @Column(length = 32, columnDefinition = "varchar(32)")
+    @Column(length = 85, columnDefinition = "varchar(85)")
-    private String fileProductNumber;
+    private String materialNo;
+
+    /**
+     * 模具号
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String modelNo;
+
+    /**
+     * 零件号
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String partNo;
 
     /**
      * 上传模板的路径
      */
+    @Column(length = 1024, columnDefinition = "varchar(1024)")
     private String fileUploadPath;
 
     /**
      * 下载路径
      */
+    @Column(length = 1024, columnDefinition = "varchar(1024)")
     private String fileDownloadPath;
 
     public FileEntity() {
     }
 
-    public FileEntity(Integer id, String fileModelNumber, String fileBatchNumber, String fileMachineCode, String fileProductNumber, String fileUploadPath, String fileDownloadPath) {
-        this.id = id;
-        this.fileModelNumber = fileModelNumber;
-        this.fileBatchNumber = fileBatchNumber;
-        this.fileMachineCode = fileMachineCode;
-        this.fileProductNumber = fileProductNumber;
-        this.fileUploadPath = fileUploadPath;
-        this.fileDownloadPath = fileDownloadPath;
-    }
-
     public Integer getId() {
         return id;
     }
@@ -72,36 +70,44 @@ public class FileEntity {
         this.id = id;
     }
 
-    public String getFileModelNumber() {
+    public String getLotNo() {
-        return fileModelNumber;
+        return lotNo;
     }
 
-    public void setFileModelNumber(String fileModelNumber) {
+    public void setLotNo(String lotNo) {
-        this.fileModelNumber = fileModelNumber;
+        this.lotNo = lotNo;
     }
 
-    public String getFileBatchNumber() {
+    public String getMachineNo() {
-        return fileBatchNumber;
+        return machineNo;
     }
 
-    public void setFileBatchNumber(String fileBatchNumber) {
+    public void setMachineNo(String machineNo) {
-        this.fileBatchNumber = fileBatchNumber;
+        this.machineNo = machineNo;
     }
 
-    public String getFileMachineCode() {
+    public String getMaterialNo() {
-        return fileMachineCode;
+        return materialNo;
     }
 
-    public void setFileMachineCode(String fileMachineCode) {
+    public void setMaterialNo(String materialNo) {
-        this.fileMachineCode = fileMachineCode;
+        this.materialNo = materialNo;
     }
 
-    public String getFileProductNumber() {
+    public String getModelNo() {
-        return fileProductNumber;
+        return modelNo;
     }
 
-    public void setFileProductNumber(String fileProductNumber) {
+    public void setModelNo(String modelNo) {
-        this.fileProductNumber = fileProductNumber;
+        this.modelNo = modelNo;
+    }
+
+    public String getPartNo() {
+        return partNo;
+    }
+
+    public void setPartNo(String partNo) {
+        this.partNo = partNo;
     }
 
     public String getFileUploadPath() {
@@ -122,14 +128,6 @@ public class FileEntity {
 
     @Override
     public String toString() {
-        return "FileEntity{" +
+        return "FileEntity{" + "id=" + id + ", lotNo='" + lotNo + '\'' + ", machineNo='" + machineNo + '\'' + ", materialNo='" + materialNo + '\'' + ", modelNo='" + modelNo + '\'' + ", partNo='" + partNo + '\'' + ", fileUploadPath='" + fileUploadPath + '\'' + ", fileDownloadPath='" + fileDownloadPath + '\'' + '}';
-                "id=" + id +
-                ", fileModelNumber='" + fileModelNumber + '\'' +
-                ", fileBatchNumber='" + fileBatchNumber + '\'' +
-                ", fileMachineCode='" + fileMachineCode + '\'' +
-                ", fileProductNumber='" + fileProductNumber + '\'' +
-                ", fileUploadPath='" + fileUploadPath + '\'' +
-                ", fileDownloadPath='" + fileDownloadPath + '\'' +
-                '}';
     }
 }

src/main/java/com/xkrs/model/entity/PictureEntity.java

@@ -0,0 +1,115 @@
+package com.xkrs.model.entity;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "qc_inspection_picture")
+public class PictureEntity {
+    /**
+     * 主键id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "qc_inspection_picture_seq_gen")
+    @SequenceGenerator(name = "qc_inspection_picture_seq_gen", sequenceName = "qc_inspection_picture_id_seq", allocationSize = 1)
+    private Integer id;
+
+    /**
+     * 批次号
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    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 picturePath;
+
+    public PictureEntity() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getLotNo() {
+        return lotNo;
+    }
+
+    public void setLotNo(String lotNo) {
+        this.lotNo = lotNo;
+    }
+
+    public String getMachineNo() {
+        return machineNo;
+    }
+
+    public void setMachineNo(String machineNo) {
+        this.machineNo = machineNo;
+    }
+
+    public String getMaterialNo() {
+        return materialNo;
+    }
+
+    public void setMaterialNo(String materialNo) {
+        this.materialNo = materialNo;
+    }
+
+    public String getModelNo() {
+        return modelNo;
+    }
+
+    public void setModelNo(String modelNo) {
+        this.modelNo = modelNo;
+    }
+
+    public String getPartNo() {
+        return partNo;
+    }
+
+    public void setPartNo(String partNo) {
+        this.partNo = partNo;
+    }
+
+    public String getPicturePath() {
+        return picturePath;
+    }
+
+    public void setPicturePath(String picturePath) {
+        this.picturePath = picturePath;
+    }
+
+    @Override
+    public String toString() {
+        return "PictureEntity{" + "id=" + id + ", lotNo='" + lotNo + '\'' + ", machineNo='" + machineNo + '\'' + ", materialNo='" + materialNo + '\'' + ", modelNo='" + modelNo + '\'' + ", partNo='" + partNo + '\'' + ", picturePath='" + picturePath + '\'' + '}';
+    }
+}

src/main/java/com/xkrs/model/entity/SpecEntity.java

@@ -0,0 +1,157 @@
+package com.xkrs.model.entity;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "qc_inspection_spec")
+public class SpecEntity {
+    /**
+     * 主键id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "qc_inspection_spec_seq_gen")
+    @SequenceGenerator(name = "qc_inspection_spec_seq_gen", sequenceName = "qc_inspection_spec_id_seq", allocationSize = 1)
+    private Integer id;
+
+    /**
+     * 零件号
+     */
+    @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 max;
+
+    /**
+     * 平均值
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String mean;
+
+    /**
+     * 最小值
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String min;
+
+    /**
+     * 单位
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String unit;
+
+    /**
+     * 检验方法
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String inspectionMethod;
+
+    /**
+     * 检验标准
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String inspectionStandard;
+
+    /**
+     * 备注
+     */
+    @Column(length = 85, columnDefinition = "varchar(85)")
+    private String remark;
+
+    public SpecEntity() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getPartNo() {
+        return partNo;
+    }
+
+    public void setPartNo(String partNo) {
+        this.partNo = partNo;
+    }
+
+    public String getInspectionItemCode() {
+        return inspectionItemCode;
+    }
+
+    public void setInspectionItemCode(String inspectionItemCode) {
+        this.inspectionItemCode = inspectionItemCode;
+    }
+
+    public String getMax() {
+        return max;
+    }
+
+    public void setMax(String max) {
+        this.max = max;
+    }
+
+    public String getMean() {
+        return mean;
+    }
+
+    public void setMean(String mean) {
+        this.mean = mean;
+    }
+
+    public String getMin() {
+        return min;
+    }
+
+    public void setMin(String min) {
+        this.min = min;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getInspectionMethod() {
+        return inspectionMethod;
+    }
+
+    public void setInspectionMethod(String inspectionMethod) {
+        this.inspectionMethod = inspectionMethod;
+    }
+
+    public String getInspectionStandard() {
+        return inspectionStandard;
+    }
+
+    public void setInspectionStandard(String inspectionStandard) {
+        this.inspectionStandard = inspectionStandard;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @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 + '\'' + '}';
+    }
+}