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/entity/Factory.java
View File

@@ -1,7 +1,6 @@
package com.cnbm.basic.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -22,7 +21,7 @@ public class Factory implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private BigDecimal id;
private Long id;
@ApiModelProperty("工厂 名")
private String name;
@@ -40,16 +39,16 @@ public class Factory implements Serializable {
private String type;
@ApiModelProperty("1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@ApiModelProperty("创建人")
private BigDecimal creatorId;
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@@ -58,7 +57,7 @@ public class Factory implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private BigDecimal updaterId;
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@@ -67,7 +66,7 @@ public class Factory implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private BigDecimal version;
private Integer version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/entity/Machine.java
View File

@@ -1,7 +1,6 @@
package com.cnbm.basic.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -22,7 +21,7 @@ public class Machine implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private BigDecimal id;
private Long id;
@ApiModelProperty("机台名")
private String name;
@@ -31,19 +30,19 @@ public class Machine implements Serializable {
private String code;
@ApiModelProperty("机台id，关联platform id")
private BigDecimal platformId;
private Long platformId;
@ApiModelProperty("1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@ApiModelProperty("创建人")
private BigDecimal creatorId;
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@@ -52,7 +51,7 @@ public class Machine implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private BigDecimal updaterId;
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@@ -61,7 +60,7 @@ public class Machine implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private BigDecimal version;
private Integer version;
}

13
ym-baisc/src/main/java/com/cnbm/basic/entity/MeasureTool.java
View File

@@ -2,7 +2,6 @@ package com.cnbm.basic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -24,7 +23,7 @@ public class MeasureTool implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private BigDecimal id;
private Long id;
@ApiModelProperty("量具 名")
private String name;
@@ -36,16 +35,16 @@ public class MeasureTool implements Serializable {
private String type;
@ApiModelProperty("1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@ApiModelProperty("创建人")
private BigDecimal creatorId;
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@@ -54,7 +53,7 @@ public class MeasureTool implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private BigDecimal updaterId;
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@@ -63,7 +62,7 @@ public class MeasureTool implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private BigDecimal version;
private Integer version;
}

13
ym-baisc/src/main/java/com/cnbm/basic/entity/Platform.java
View File

@@ -1,7 +1,6 @@
package com.cnbm.basic.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -22,7 +21,7 @@ public class Platform implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private BigDecimal id;
private Long id;
@ApiModelProperty("站台名")
private String name;
@@ -34,16 +33,16 @@ public class Platform implements Serializable {
private String group;
@ApiModelProperty("1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@ApiModelProperty("创建人")
private BigDecimal creatorId;
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@@ -52,7 +51,7 @@ public class Platform implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private BigDecimal updaterId;
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@@ -61,7 +60,7 @@ public class Platform implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private BigDecimal version;
private Integer version;
}

84
ym-baisc/src/main/java/com/cnbm/basic/entity/Product.java Normal file
View File

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

65
ym-baisc/src/main/java/com/cnbm/basic/entity/ProductFactoryRelation.java Normal file
View File

@@ -0,0 +1,65 @@
package com.cnbm.basic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* <p>
* 产品-工厂 关系表
* </p>
*
* @author why
* @since 2022-07-27
*/
@Data
@TableName("product_factory_relation")
@ApiModel(value = "ProductFactoryRelation对象", description = "产品-工厂 关系表")
public class ProductFactoryRelation implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
@ApiModelProperty("产品id,关联product表")
private Long productId;
@ApiModelProperty("工厂id,关联 factory 表")
private Long factoryId;
@ApiModelProperty("1 可用，0 不可用")
private Integer status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private Integer valid;
@ApiModelProperty("创建人")
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ApiModelProperty("更新时间")
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
}

34
ym-baisc/src/main/java/com/cnbm/basic/entity/ProductFeatures.java
View File

@@ -2,7 +2,6 @@ package com.cnbm.basic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -24,16 +23,16 @@ public class ProductFeatures implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private BigDecimal id;
private Long id;
@ApiModelProperty("产品id,关联product表")
private BigDecimal productId;
private Long productId;
@ApiModelProperty("量具id，关联measure_tool表")
private BigDecimal measureToolId;
private Long measureToolId;
@ApiModelProperty("单位 id，关联unit表")
private BigDecimal unitId;
private Long unitId;
@ApiModelProperty("产品特性 名")
private String name;
@@ -42,10 +41,10 @@ public class ProductFeatures implements Serializable {
private String code;
@ApiModelProperty("产品特性类型：1 计量型；2 计数型")
private BigDecimal type;
private Integer type;
@ApiModelProperty("缺陷等级：1 致命缺陷；2 严重缺陷；3.轻微缺陷")
private BigDecimal defectLevel;
private Integer defectLevel;
@ApiModelProperty("产品特性 规格")
private String specifications;
@@ -60,25 +59,22 @@ public class ProductFeatures implements Serializable {
private Float usl;
@ApiModelProperty("工序id，关联 working_procedure 表id")
private BigDecimal workingProcedureId;
private Long workingProcedureId;
@ApiModelProperty("分析图形，关联control_graph表id")
private BigDecimal controlGraphId;
@ApiModelProperty("（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private BigDecimal inspectionStage;
private Long controlGraphId;
@ApiModelProperty("是否需要spc分析，1 yes;0 no")
private BigDecimal isSpc;
private Integer isSpc;
@ApiModelProperty("样本大小，一般2-25之间。 会依据这个size 把所有待分析的数据 组成一个一个样本")
private BigDecimal sampleSize;
private Integer sampleSize;
@ApiModelProperty("采样频率，只用于展示")
private String samplingFrequency;
@ApiModelProperty("小数位数（限制 检验参数小数点后面位数），这个先放着后续再说。")
private BigDecimal decimalPlaces;
private Integer decimalPlaces;
@ApiModelProperty("目标cpk")
private Float targetCpk;
@@ -90,10 +86,10 @@ public class ProductFeatures implements Serializable {
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@ApiModelProperty("创建人")
private BigDecimal creatorId;
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@@ -102,7 +98,7 @@ public class ProductFeatures implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private BigDecimal updaterId;
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@@ -111,7 +107,7 @@ public class ProductFeatures implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private BigDecimal version;
private Integer version;
}

36
ym-baisc/src/main/java/com/cnbm/basic/entity/ProductFeaturesHis.java
View File

@@ -2,7 +2,6 @@ package com.cnbm.basic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -24,13 +23,13 @@ public class ProductFeaturesHis implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private BigDecimal id;
private Long id;
@ApiModelProperty("产品特性id,关联product_features表")
private BigDecimal productFeaturesId;
private Long productFeaturesId;
@ApiModelProperty("产品id,关联product表")
private BigDecimal productId;
private Long productId;
@ApiModelProperty("产品特性 名")
private String name;
@@ -39,16 +38,16 @@ public class ProductFeaturesHis implements Serializable {
private String code;
@ApiModelProperty("产品特性类型：1 计量型；2 计数型")
private BigDecimal type;
private Integer type;
@ApiModelProperty("缺陷等级：1 致命缺陷；2 严重缺陷；3.轻微缺陷")
private BigDecimal defectLevel;
private Integer defectLevel;
@ApiModelProperty("量具id，关联measure_tool表")
private BigDecimal measureToolId;
private Long measureToolId;
@ApiModelProperty("单位 id，关联unit表")
private BigDecimal unitId;
private Long unitId;
@ApiModelProperty("产品特性 规格")
private String specifications;
@@ -63,25 +62,22 @@ public class ProductFeaturesHis implements Serializable {
private Float usl;
@ApiModelProperty("工序id，关联 working_procedure 表id")
private BigDecimal workingProcedureId;
@ApiModelProperty("（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private BigDecimal inspectionStage;
private Long workingProcedureId;
@ApiModelProperty("是否需要spc分析，1 yes;0 no")
private BigDecimal isSpc;
private Integer isSpc;
@ApiModelProperty("分析图形，关联control_graph表id")
private BigDecimal controlGraphId;
private Long controlGraphId;
@ApiModelProperty("样本大小，一般2-25之间。 会依据这个size 把所有待分析的数据 组成一个一个样本")
private BigDecimal sampleSize;
private Integer sampleSize;
@ApiModelProperty("采样频率，只用于展示")
private String samplingFrequency;
@ApiModelProperty("小数位数（限制 检验参数小数点后面位数），这个先放着后续再说。")
private BigDecimal decimalPlaces;
private Integer decimalPlaces;
@ApiModelProperty("目标cpk")
private Float targetCpk;
@@ -93,10 +89,10 @@ public class ProductFeaturesHis implements Serializable {
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@ApiModelProperty("创建人")
private BigDecimal creatorId;
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@@ -105,7 +101,7 @@ public class ProductFeaturesHis implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private BigDecimal updaterId;
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@@ -114,7 +110,7 @@ public class ProductFeaturesHis implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private BigDecimal version;
private Integer version;
}

13
ym-baisc/src/main/java/com/cnbm/basic/entity/ProductType.java
View File

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -25,7 +24,7 @@ public class ProductType implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private BigDecimal id;
private Long id;
@ApiModelProperty("产品类型 名")
private String name;
@@ -37,16 +36,16 @@ public class ProductType implements Serializable {
private String descs;
@ApiModelProperty("1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@ApiModelProperty("创建人")
private BigDecimal creatorId;
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@@ -55,7 +54,7 @@ public class ProductType implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private BigDecimal updaterId;
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@@ -64,7 +63,7 @@ public class ProductType implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private BigDecimal version;
private Integer version;
}

23
ym-baisc/src/main/java/com/cnbm/basic/entity/ProductWorkingprocedureRelation.java
View File

@@ -2,10 +2,10 @@ package com.cnbm.basic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;
/**
@@ -24,31 +24,28 @@ public class ProductWorkingprocedureRelation implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private BigDecimal id;
private Long id;
@ApiModelProperty("产品id,关联product表")
private BigDecimal productId;
private Long productId;
@ApiModelProperty("工序id,关联 working_procedure 表")
private BigDecimal workingProcedureId;
private Long workingProcedureId;
@ApiModelProperty("顺序，工序是有先后顺序的。")
private BigDecimal order;
@ApiModelProperty("检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private BigDecimal inspectionStage;
private Integer order;
@ApiModelProperty("1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@ApiModelProperty("创建人")
private BigDecimal creatorId;
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@@ -57,7 +54,7 @@ public class ProductWorkingprocedureRelation implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private BigDecimal updaterId;
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@@ -66,7 +63,7 @@ public class ProductWorkingprocedureRelation implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private BigDecimal version;
private Integer version;
}

13
ym-baisc/src/main/java/com/cnbm/basic/entity/Shift.java
View File

@@ -1,7 +1,6 @@
package com.cnbm.basic.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -22,7 +21,7 @@ public class Shift implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private BigDecimal id;
private Long id;
@ApiModelProperty("班次 名")
private String name;
@@ -34,16 +33,16 @@ public class Shift implements Serializable {
private String descs;
@ApiModelProperty("1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@ApiModelProperty("创建人")
private BigDecimal creatorId;
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@@ -52,7 +51,7 @@ public class Shift implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private BigDecimal updaterId;
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@@ -61,7 +60,7 @@ public class Shift implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private BigDecimal version;
private Integer version;
}

13
ym-baisc/src/main/java/com/cnbm/basic/entity/Team.java
View File

@@ -1,7 +1,6 @@
package com.cnbm.basic.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -22,7 +21,7 @@ public class Team implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private BigDecimal id;
private Long id;
@ApiModelProperty("班组 名")
private String name;
@@ -34,16 +33,16 @@ public class Team implements Serializable {
private String descs;
@ApiModelProperty("1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@ApiModelProperty("创建人")
private BigDecimal creatorId;
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@@ -52,7 +51,7 @@ public class Team implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private BigDecimal updaterId;
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@@ -61,7 +60,7 @@ public class Team implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private BigDecimal version;
private Integer version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/entity/Unit.java
View File

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -23,7 +22,7 @@ public class Unit implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private BigDecimal id;
private Long id;
@ApiModelProperty("单位 名")
private String name;
@@ -32,19 +31,19 @@ public class Unit implements Serializable {
private String code;
@ApiModelProperty("单位类型，1 可计数，2 不可计数")
private BigDecimal type;
private Integer type;
@ApiModelProperty("1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@ApiModelProperty("创建人")
private BigDecimal creatorId;
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@@ -53,7 +52,7 @@ public class Unit implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private BigDecimal updaterId;
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@@ -62,7 +61,7 @@ public class Unit implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private BigDecimal version;
private Integer version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/entity/WorkingProcedure.java
View File

@@ -2,7 +2,6 @@ package com.cnbm.basic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -24,7 +23,7 @@ public class WorkingProcedure implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private BigDecimal id;
private Long id;
@ApiModelProperty("工序 名")
private String name;
@@ -33,22 +32,22 @@ public class WorkingProcedure implements Serializable {
private String code;
@ApiModelProperty("工序类型 id,关联working_procedure_type表")
private BigDecimal workingProcedureTypeId;
private Long workingProcedureTypeId;
@ApiModelProperty("机台(也就是设备)，这个工序对应的设备，可能有一个或者多个，如果多个用逗号隔开，\"id1,id2,......\"")
private String machineId;
@ApiModelProperty("1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@ApiModelProperty("创建人")
private BigDecimal creatorId;
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@@ -57,7 +56,7 @@ public class WorkingProcedure implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private BigDecimal updaterId;
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@@ -66,7 +65,7 @@ public class WorkingProcedure implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private BigDecimal version;
private Integer version;
}

13
ym-baisc/src/main/java/com/cnbm/basic/entity/WorkingProcedureType.java
View File

@@ -2,7 +2,6 @@ package com.cnbm.basic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -24,7 +23,7 @@ public class WorkingProcedureType implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private BigDecimal id;
private Long id;
@ApiModelProperty("工序类型 名")
private String name;
@@ -33,16 +32,16 @@ public class WorkingProcedureType implements Serializable {
private String code;
@ApiModelProperty("1 可用，0 不可用")
private BigDecimal status;
private Integer status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private BigDecimal valid;
private Integer valid;
@ApiModelProperty("创建人")
private BigDecimal creatorId;
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@@ -51,7 +50,7 @@ public class WorkingProcedureType implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private BigDecimal updaterId;
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@@ -60,7 +59,7 @@ public class WorkingProcedureType implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private BigDecimal version;
private Integer version;
}