diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index fdd1204..1d26919 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -4673,4 +4673,53 @@ public class MesPcnEnumUtil { } } + /** + * mes设备状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQUIPMENT_STATUS { + + INUSE(10, "在用"), + SPARE(20, "停止"), + FAULT(30, "故障"), + SERVICE(40, "检修"), + STOPUSING(50, "暂停"); + + private int value; + private String description; + + MES_EQUIPMENT_STATUS(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/MesEquipmentTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTravel.java new file mode 100644 index 0000000..0480688 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTravel.java @@ -0,0 +1,98 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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 javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :设备运行履历表 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQUIPMENT_TRAVEL") +@Api("设备运行履历表") +public class MesEquipmentTravel extends BaseBean implements Serializable { + + private static final long serialVersionUID = -419342647505833190L; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name = "STATUS") + @ApiParam("设备状态") + private Integer status; + + @Column(name = "EQUIPMENT_TYPE") + @ApiParam("设备类型") + private Integer equipmentType; + + @Column(name = "EQUIPMENT_CATEGORY") + @ApiParam("设备类别") + private String equipmentCategory; + + @Column(name = "EQUIPMENT_MODEL") + @ApiParam("型号") + private String equipmentModel; + + @Column(name = "EQUIPMENT_SPEC") + @ApiParam("规格") + private String equipmentSpec; + + @Column(name = "EQUIPMENT_MAKER") + @ApiParam("制造商") + private String equipmentMaker; + + @Column(name = "RELEASE_DATE") + @ApiParam("出厂日期") + private String releaseDate; + + @Column(name = "RECEIVE_DATE") + @ApiParam("接收日期") + private String receiveDate; + + @Column(name = "ENABLE_DATE") + @ApiParam("启用日期") + private String enableDate; + + @Column(name = "CONNECT_TYPE") + @ApiParam("连接类型") + private Integer connectType; + + @Column(name = "CHECK_MODEL") + @ApiParam("作业校验模式") + private Integer checkModel; + + @Column(name = "STATUS_START_TIME") + @ApiParam("状态开始时间") + private String statusStartTime; + + @Column(name = "STATUS_END_TIME") + @ApiParam("状态结束时间") + private String statusEndTime; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java index 6891043..fa219c6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java @@ -32,6 +32,10 @@ public class PlcEquStatusModel implements Serializable { @ApiParam("产线状态") private Integer workCenterStatus; + // 电检设备切换密码 + @ApiParam("电检设备切换密码") + private String equChoosePassWard; + @ApiParam("停机类型") private Integer stopType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentTravelRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentTravelRepository.java new file mode 100644 index 0000000..515ee67 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentTravelRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentTravel; +import org.springframework.stereotype.Repository; + +/** + * @Description :设备运行履历 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEquipmentTravelRepository extends BaseRepository { +}