diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index eba9bab..86a9633 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -5730,4 +5730,96 @@ public class MesEnumUtil { } } + /** + * MES_产品颜色 类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_COLOR_TYPE { + + PRODUCT_COLOR(10, "产品颜色"), + MATERIAL_COLOR(20, "物料颜色"); + + private int value; + private String description; + + MES_COLOR_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * MES_车型散件配置清单 选配类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_OPTION_TYPE { + + OPTION_PART(1, "选配件"), + BOM_DISASSEMBLY(2, "BOM拆解"); + + private int value; + private String description; + + MES_OPTION_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java new file mode 100644 index 0000000..224a78c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesModelGrade.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description:车型等级 + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\05\14 10:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MODEL_GRADE") +@Api("MES_车型等级") +public class MesModelGrade extends BaseBean implements Serializable { + private static final long serialVersionUID = -5412635747427364076L; + + @Column(name = "GRADE_CODE") + @ApiParam("等级代码") + private String gradeCode; + + @Column(name = "GRADE_NAME") + @ApiParam("等级名称") + private String gradeName; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "GRADE_FLAG_VALUE") + @ApiParam("等级标识值") + private String gradeFlagValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java new file mode 100644 index 0000000..578b4c6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartColor.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description:产品颜色 + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\05\14 10:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_COLOR") +@Api("MES_产品颜色") +public class MesPartColor extends BaseBean implements Serializable { + private static final long serialVersionUID = -5412632727837364076L; + + @Column(name = "COLOR_TYPE") + @ApiParam("类型") + private Integer colorType; + + @Column(name = "COLOR_CODE") + @ApiParam("颜色代码") + private String colorCode; + + @Column(name = "COLOR_NAME") + @ApiParam("颜色名称") + private String colorName; + + @Column(name = "IF_COLOR_CODE") + @ApiParam("接口颜色代码") + private String ifColorCode; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "MODEL_YEAR") + @ApiParam("年度型") + private String modelYear; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java new file mode 100644 index 0000000..be8e632 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java @@ -0,0 +1,84 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description:产品车型配置 + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\05\14 15:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_MODEL_CFG") +@Api("MES_产品车型配置") +public class MesProdModelCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -5227132727837364076L; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "MODEL_YEAR") + @ApiParam("年度型") + private String modelYear; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "PART_NO") + @ApiParam("总成零件号") + private String partNo; + + @Column(name = "CUSTOMER_PART_NO") + @ApiParam("客户零件号") + private String customerPartNo; + + @Column(name = "GRADE_CODE") + @ApiParam("等级代码") + private String gradeCode; + + @Column(name = "MODEL_FLAG_VALUE") + @ApiParam("车型标志值") + private String modelFlagValue; + + @Column(name = "MODEL_CFG_FLAG_VALUE") + @ApiParam("车型配置标志值") + private String modelCfgFlagValue; + + @Column(name = "QC_FLAG_VALUE") + @ApiParam("质量标志值") + private String qcFlagValue; + + @Column(name = "LABEL_DESC") + @ApiParam("条码标签描述") + private String labelDesc; + + @Column(name = "CCC_CODE") + @ApiParam("3C认证编码") + private String cccCode; + + @Column(name = "PROCESS_LABEL_TEMPLATE") + @ApiParam("过程标签模板") + private String processLabelTemplate; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java new file mode 100644 index 0000000..fd2e7c3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description:车型散件配置清单 + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\05\14 10:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCATTER_PART_CFG_BOM") +@Api("MES_车型散件配置清单") +public class MesScatterPartCfgBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -5412635772834364076L; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "MODEL_YEAR") + @ApiParam("年度型") + private String modelYear; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "CUST_PART_NO") + @ApiParam("客户零件号") + private String custPartNo; + + @Column(name = "PART_FLAG_LOCATION") + @ApiParam("零件标志位") + private Integer partFlagLocation; + + @Column(name = "PART_FLAG_VALUE") + @ApiParam("零件标志值") + private String partFlagValue; + + @Column(name = "QTY", columnDefinition = "decimal(18,3)") + @ColumnDefault("0") + @ApiParam(value = "用量", example = "0") + public Double qty; + + @Column(name = "OPTION_TYPE") + @ApiParam("选配类型") + private Integer optionType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java new file mode 100644 index 0000000..4d177e8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -0,0 +1,150 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; +import java.util.Date; + +/** + * @Description:散件零件生产配置 + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\05\14 10:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCATTER_PART_PROD_CFG") +@Api("MES_散件零件生产配置") +public class MesScatterPartProdCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -5412632727837782394L; + + @Column(name = "CFG_ID") + @ApiParam("配置编号") + private String cfgId; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "MODEL_FLAG_VALUE") + @ApiParam("车型标志值") + private String modelFalgValue; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "GRADE_CODE") + @ApiParam("等级代码") + private String gradeCode; + + @Column(name = "COLOR_CODE") + @ApiParam("颜色代码") + private String colorCode; + + @Column(name = "PART_FLAG_LOCATION") + @ApiParam("标志位") + private Integer partFlagLocation; + + @Column(name = "PART_FLAG_VALUE") + @ApiParam("标志值") + private String partFlagValue; + + @Column(name = "POKE_YOKE_FIX") + @ApiParam("防错码") + private String pokeYokeFix; + + @Column(name = "POKE_YOKE_FROM") + @ApiParam("防错码开始位") + private Integer pokeYokeFrom; + + @Column(name = "POKE_YOKE_END") + @ApiParam("防错码结束位") + private Integer pokeYokeEnd; + + @Column(name = "POKE_YOKE_LENGTH") + @ApiParam("防错码长度") + private Integer pokeYokeLength; + + @Column(name = "PEST1") + @ApiParam("PEST编码1") + private Integer pest1; + + @Column(name = "PEST2") + @ApiParam("PEST编码2") + private Integer pest2; + + @Column(name = "PEST3") + @ApiParam("PEST编码3") + private Integer pest3; + + @Column(name = "PEST4") + @ApiParam("PEST编码4") + private Integer pest4; + + @Column(name = "PEST5") + @ApiParam("PEST编码5") + private Integer pest5; + + @Column(name = "PEST6") + @ApiParam("PEST编码6") + private Integer pest6; + + @Column(name = "PEST7") + @ApiParam("PEST编码7") + private Integer pest7; + + @Column(name = "PEST8") + @ApiParam("PEST编码8") + private Integer pest8; + + @Column(name = "TORQUE_NO") + @ApiParam("扭矩枪编号") + private String torqueNo; + + @Column(name = "IS_PF") + @ApiParam("是否大枪") + private Integer isPf; + + @Column(name = "POKE_TYKE_SEQ") + @ApiParam("防错顺序") + private Integer pokeTypeSeq; + + @Column(name = "EFF_START_TIME") + @ApiParam("有效起始日期") + private Date effStartTime; + + @Column(name = "EFF_END_TIME") + @ApiParam("有效截至日期") + private Date effEndTime; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + +}