CaiXiang/SPC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

数据库字段更改

Browse Source
This commit is contained in:
闫阳
2022-07-29 14:19:35 +08:00
parent 8a3a037bda
commit bac1ec5b70
82 changed files with 1447 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ym-baisc/src/main/java/com/cnbm/basic/excel/FactoryExcel.java
View File

@@ -4,7 +4,6 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
@@ -17,7 +16,7 @@ import java.util.Date;
@Data
public class FactoryExcel {
@Excel(name = "ID")
private BigDecimal id;
private Long id;
@Excel(name = "工厂 名")
private String name;
@Excel(name = "工厂 编码")
@@ -29,24 +28,24 @@ public class FactoryExcel {
@Excel(name = "工厂类型，1-内部工厂；2-供应商")
private String type;
@Excel(name = "1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@Excel(name = "创建人")
private BigDecimal creatorId;
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private BigDecimal updaterId;
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private BigDecimal version;
private Integer version;
}

17
ym-baisc/src/main/java/com/cnbm/basic/excel/MachineExcel.java
View File

@@ -4,9 +4,6 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 机台表
@@ -17,32 +14,32 @@ import java.util.Date;
@Data
public class MachineExcel {
@Excel(name = "ID")
private BigDecimal id;
private Long id;
@Excel(name = "机台名")
private String name;
@Excel(name = "机台编码")
private String code;
@Excel(name = "机台id，关联platform id")
private BigDecimal platformId;
private Long platformId;
@Excel(name = "1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@Excel(name = "创建人")
private BigDecimal creatorId;
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private BigDecimal updaterId;
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private BigDecimal version;
private Integer version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/excel/MeasureToolExcel.java
View File

@@ -4,9 +4,6 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 量具表
@@ -17,7 +14,7 @@ import java.util.Date;
@Data
public class MeasureToolExcel {
@Excel(name = "ID")
private BigDecimal id;
private Long id;
@Excel(name = "量具 名")
private String name;
@Excel(name = "量具 编码")
@@ -25,24 +22,24 @@ public class MeasureToolExcel {
@Excel(name = "量具类型；计量型=1 计数型=2")
private String type;
@Excel(name = "1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@Excel(name = "创建人")
private BigDecimal creatorId;
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private BigDecimal updaterId;
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private BigDecimal version;
private Integer version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/excel/PlatformExcel.java
View File

@@ -4,9 +4,6 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 站点表
@@ -17,7 +14,7 @@ import java.util.Date;
@Data
public class PlatformExcel {
@Excel(name = "ID")
private BigDecimal id;
private Long id;
@Excel(name = "站台名")
private String name;
@Excel(name = "站台编码")
@@ -25,24 +22,24 @@ public class PlatformExcel {
@Excel(name = "站台分组")
private String group;
@Excel(name = "1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@Excel(name = "创建人")
private BigDecimal creatorId;
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private BigDecimal updaterId;
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private BigDecimal version;
private Integer version;
}

57
ym-baisc/src/main/java/com/cnbm/basic/excel/ProductExcel.java Normal file
View File

@@ -0,0 +1,57 @@
package com.cnbm.basic.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 产品 表
*
* @author why
* @since 2022-07-11
*/
@Data
public class ProductExcel {
@Excel(name = "ID")
private Long id;
@Excel(name = "产品 名")
private String name;
@Excel(name = "产品 编码")
private String code;
@Excel(name = "产品 规格")
private String specifications;
@Excel(name = "产品 图纸")
private String drawing;
@Excel(name = "描述")
private String descs;
@Excel(name = "产品类型id,关联product_type表")
private Long productTypeId;
@Excel(name = "单位 id，关联unit表")
private Long unitId;
@Excel(name = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;; 如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private String inspectionStage;
@Excel(name = "检验标准")
private String inspectionStandard;
@Excel(name = "1 可用，0 不可用")
private Integer status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
@Excel(name = "创建人")
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
}

43
ym-baisc/src/main/java/com/cnbm/basic/excel/ProductFactoryRelationExcel.java Normal file
View File

@@ -0,0 +1,43 @@
package com.cnbm.basic.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 产品-工厂 关系表
*
* @author why
* @since 2022-07-27
*/
@Data
public class ProductFactoryRelationExcel {
@Excel(name = "ID")
private Long id;
@Excel(name = "产品id,关联product表")
private Long productId;
@Excel(name = "工厂id,关联 factory 表")
private Long factoryId;
@Excel(name = "1 可用，0 不可用")
private Integer status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
@Excel(name = "创建人")
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
}

35
ym-baisc/src/main/java/com/cnbm/basic/excel/ProductFeaturesExcel.java
View File

@@ -4,9 +4,6 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 产品特性 表
@@ -17,21 +14,21 @@ import java.util.Date;
@Data
public class ProductFeaturesExcel {
@Excel(name = "ID")
private BigDecimal id;
private Long id;
@Excel(name = "产品id,关联product表")
private BigDecimal productId;
private Long productId;
@Excel(name = "量具id，关联measure_tool表")
private BigDecimal measureToolId;
private Long measureToolId;
@Excel(name = "单位 id，关联unit表")
private BigDecimal unitId;
private Long unitId;
@Excel(name = "产品特性 名")
private String name;
@Excel(name = "产品特性 编码")
private String code;
@Excel(name = "产品特性类型：1 计量型；2 计数型")
private BigDecimal type;
private Integer type;
@Excel(name = "缺陷等级：1 致命缺陷；2 严重缺陷；3.轻微缺陷")
private BigDecimal defectLevel;
private Integer defectLevel;
@Excel(name = "产品特性 规格")
private String specifications;
@Excel(name = "检验参数 规格下线")
@@ -41,19 +38,17 @@ public class ProductFeaturesExcel {
@Excel(name = "检验参数 规格上线")
private Float usl;
@Excel(name = "工序id，关联 working_procedure 表id")
private BigDecimal workingProcedureId;
private Long workingProcedureId;
@Excel(name = "分析图形，关联control_graph表id")
private BigDecimal controlGraphId;
@Excel(name = "（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private BigDecimal inspectionStage;
private Long controlGraphId;
@Excel(name = "是否需要spc分析，1 yes;0 no")
private BigDecimal isSpc;
private Integer isSpc;
@Excel(name = "样本大小，一般2-25之间。 会依据这个size 把所有待分析的数据 组成一个一个样本")
private BigDecimal sampleSize;
private Integer sampleSize;
@Excel(name = "采样频率，只用于展示")
private String samplingFrequency;
@Excel(name = "小数位数（限制 检验参数小数点后面位数），这个先放着后续再说。")
private BigDecimal decimalPlaces;
private Integer decimalPlaces;
@Excel(name = "目标cpk")
private Float targetCpk;
@Excel(name = "目标cpk")
@@ -61,20 +56,20 @@ public class ProductFeaturesExcel {
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@Excel(name = "创建人")
private BigDecimal creatorId;
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private BigDecimal updaterId;
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private BigDecimal version;
private Integer version;
}

37
ym-baisc/src/main/java/com/cnbm/basic/excel/ProductFeaturesHisExcel.java
View File

@@ -4,9 +4,6 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 产品特性 历史表
@@ -17,23 +14,23 @@ import java.util.Date;
@Data
public class ProductFeaturesHisExcel {
@Excel(name = "ID")
private BigDecimal id;
private Long id;
@Excel(name = "产品特性id,关联product_features表")
private BigDecimal productFeaturesId;
private Long productFeaturesId;
@Excel(name = "产品id,关联product表")
private BigDecimal productId;
private Long productId;
@Excel(name = "产品特性 名")
private String name;
@Excel(name = "产品特性 编码")
private String code;
@Excel(name = "产品特性类型：1 计量型；2 计数型")
private BigDecimal type;
private Integer type;
@Excel(name = "缺陷等级：1 致命缺陷；2 严重缺陷；3.轻微缺陷")
private BigDecimal defectLevel;
private Integer defectLevel;
@Excel(name = "量具id，关联measure_tool表")
private BigDecimal measureToolId;
private Long measureToolId;
@Excel(name = "单位 id，关联unit表")
private BigDecimal unitId;
private Long unitId;
@Excel(name = "产品特性 规格")
private String specifications;
@Excel(name = "检验参数 规格下线")
@@ -43,19 +40,17 @@ public class ProductFeaturesHisExcel {
@Excel(name = "检验参数 规格上线")
private Float usl;
@Excel(name = "工序id，关联 working_procedure 表id")
private BigDecimal workingProcedureId;
@Excel(name = "（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private BigDecimal inspectionStage;
private Long workingProcedureId;
@Excel(name = "是否需要spc分析，1 yes;0 no")
private BigDecimal isSpc;
private Integer isSpc;
@Excel(name = "分析图形，关联control_graph表id")
private BigDecimal controlGraphId;
private Long controlGraphId;
@Excel(name = "样本大小，一般2-25之间。 会依据这个size 把所有待分析的数据 组成一个一个样本")
private BigDecimal sampleSize;
private Integer sampleSize;
@Excel(name = "采样频率，只用于展示")
private String samplingFrequency;
@Excel(name = "小数位数（限制 检验参数小数点后面位数），这个先放着后续再说。")
private BigDecimal decimalPlaces;
private Integer decimalPlaces;
@Excel(name = "目标cpk")
private Float targetCpk;
@Excel(name = "目标cpk")
@@ -63,20 +58,20 @@ public class ProductFeaturesHisExcel {
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@Excel(name = "创建人")
private BigDecimal creatorId;
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private BigDecimal updaterId;
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private BigDecimal version;
private Integer version;
}

13
ym-baisc/src/main/java/com/cnbm/basic/excel/ProductTypeExcel.java
View File

@@ -3,7 +3,6 @@ package com.cnbm.basic.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -15,7 +14,7 @@ import java.time.LocalDateTime;
@Data
public class ProductTypeExcel {
@Excel(name = "ID")
private BigDecimal id;
private Long id;
@Excel(name = "产品类型 名")
private String name;
@Excel(name = "产品类型 编码")
@@ -23,24 +22,24 @@ public class ProductTypeExcel {
@Excel(name = "描述")
private String desc;
@Excel(name = "1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@Excel(name = "创建人")
private BigDecimal creatorId;
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private BigDecimal updaterId;
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private BigDecimal version;
private Integer version;
}

23
ym-baisc/src/main/java/com/cnbm/basic/excel/ProductWorkingprocedureRelationExcel.java
View File

@@ -4,9 +4,6 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 工序 表
@@ -17,34 +14,32 @@ import java.util.Date;
@Data
public class ProductWorkingprocedureRelationExcel {
@Excel(name = "ID")
private BigDecimal id;
private Long id;
@Excel(name = "产品id,关联product表")
private BigDecimal productId;
private Long productId;
@Excel(name = "工序id,关联 working_procedure 表")
private BigDecimal workingProcedureId;
private Long workingProcedureId;
@Excel(name = "顺序，工序是有先后顺序的。")
private BigDecimal order;
@Excel(name = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private BigDecimal inspectionStage;
private Integer order;
@Excel(name = "1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@Excel(name = "创建人")
private BigDecimal creatorId;
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private BigDecimal updaterId;
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private BigDecimal version;
private Integer version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/excel/ShiftExcel.java
View File

@@ -4,9 +4,6 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 班次 表
@@ -17,7 +14,7 @@ import java.util.Date;
@Data
public class ShiftExcel {
@Excel(name = "ID")
private BigDecimal id;
private Long id;
@Excel(name = "班次 名")
private String name;
@Excel(name = "班次 编码")
@@ -25,24 +22,24 @@ public class ShiftExcel {
@Excel(name = "班次 描述")
private String descs;
@Excel(name = "1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@Excel(name = "创建人")
private BigDecimal creatorId;
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private BigDecimal updaterId;
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private BigDecimal version;
private Integer version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/excel/TeamExcel.java
View File

@@ -4,9 +4,6 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 班组 表
@@ -17,7 +14,7 @@ import java.util.Date;
@Data
public class TeamExcel {
@Excel(name = "ID")
private BigDecimal id;
private Long id;
@Excel(name = "班组 名")
private String name;
@Excel(name = "班组 编码")
@@ -25,24 +22,24 @@ public class TeamExcel {
@Excel(name = "班组 描述")
private String descs;
@Excel(name = "1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@Excel(name = "创建人")
private BigDecimal creatorId;
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private BigDecimal updaterId;
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private BigDecimal version;
private Integer version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/excel/UnitExcel.java
View File

@@ -3,7 +3,6 @@ package com.cnbm.basic.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -15,32 +14,32 @@ import java.time.LocalDateTime;
@Data
public class UnitExcel {
@Excel(name = "ID")
private BigDecimal id;
private Long id;
@Excel(name = "单位 名")
private String name;
@Excel(name = "单位 编码")
private String code;
@Excel(name = "单位类型，1 可计数，2 不可计数")
private BigDecimal type;
private Integer type;
@Excel(name = "1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@Excel(name = "创建人")
private BigDecimal creatorId;
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private BigDecimal updaterId;
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private BigDecimal version;
private Integer version;
}

17
ym-baisc/src/main/java/com/cnbm/basic/excel/WorkingProcedureExcel.java
View File

@@ -4,9 +4,6 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 工序 表
@@ -17,34 +14,34 @@ import java.util.Date;
@Data
public class WorkingProcedureExcel {
@Excel(name = "ID")
private BigDecimal id;
private Long id;
@Excel(name = "工序 名")
private String name;
@Excel(name = "工序 编码")
private String code;
@Excel(name = "工序类型 id,关联working_procedure_type表")
private BigDecimal workingProcedureTypeId;
private Long workingProcedureTypeId;
@Excel(name = "机台(也就是设备)，这个工序对应的设备，可能有一个或者多个，如果多个用逗号隔开，\"id1,id2,......\"")
private String machineId;
@Excel(name = "1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@Excel(name = "创建人")
private BigDecimal creatorId;
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private BigDecimal updaterId;
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private BigDecimal version;
private Integer version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/excel/WorkingProcedureTypeExcel.java
View File

@@ -4,9 +4,6 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 工序类型表 表
@@ -17,30 +14,30 @@ import java.util.Date;
@Data
public class WorkingProcedureTypeExcel {
@Excel(name = "ID")
private BigDecimal id;
private Long id;
@Excel(name = "工序类型 名")
private String name;
@Excel(name = "工序类型 编码")
private String code;
@Excel(name = "1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@Excel(name = "创建人")
private BigDecimal creatorId;
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private BigDecimal updaterId;
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private BigDecimal version;
private Integer version;
}