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 85c0088..003c779 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 @@ -4917,80 +4917,4 @@ public class MesEnumUtil { } } - /** - * 备件类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SP_TYPE { - - VULNERABLE_PART("10", "易损件"), - KEY_PART("20", "关键件"), - STANDARD_PART("30", "标准件"); - - private String value; - private String description; - - SP_TYPE(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(String val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(val)) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** - * 备件明细状态 - */ - /** - * 备件操作记录-操作类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SPARE_PART_DETAIL_STATUS{ - IN_LIBRARY(10, "在库"), - USE(20, "领用"), - SCRAPED(30, "报废"); - - private int value; - private String description; - - SPARE_PART_DETAIL_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; - } - } - } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java deleted file mode 100644 index 52d1380..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocate.java +++ /dev/null @@ -1,44 +0,0 @@ -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: joke.wang - * @CreateDate: 2019\10\10 0010 11:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_LOCATE") -@Api("MES_库位") -public class MesLocate extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1229825295729375298L; - @Column(name = "LOCATE_NO") - @ApiParam("库位编号") - private String locateNo; - - @Column(name = "LOCATE_NAME") - @ApiParam("库位名称") - private String locateName; - - @Column(name = "ZONE_NO") - @ApiParam("存储区代码") - private String zoneNo; -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java deleted file mode 100644 index e331486..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpActionRecord.java +++ /dev/null @@ -1,52 +0,0 @@ -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: joke.wang - * @CreateDate: 2019\10\10 0010 11:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SP_ACTION_RECORD") -@Api("MES_备件操作记录") -public class MesSpActionRecord extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1222647293041375978L; - @Column(name = "SP_NO") - @ApiParam("备件编号") - private String spNo; - - @Column(name = "ACTION_TYPE") - @ApiParam("操作类型") - private Integer actionType; - - @Column(name = "SP_CODE") - @ApiParam("备件代码") - private String spCode; - - @Column(name = "SP_NAME") - @ApiParam("备件名称") - private String spName; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java deleted file mode 100644 index 793e49e..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePart.java +++ /dev/null @@ -1,52 +0,0 @@ -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: joke.wang - * @CreateDate: 2019\10\10 0010 11:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SPARE_PART") -@Api("MES_备件表") -public class MesSparePart extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1229825293041375978L; - @Column(name = "SP_CODE") - @ApiParam("备件代码") - private String spCode; - - @Column(name = "SP_NAME") - @ApiParam("备件名称") - private String spName; - - @Column(name = "SP_TYPE") - @ApiParam("备件类型") - private String spType; - - @Column(name = "SP_CATEGORY") - @ApiParam("备件类别") - private String spCategory; - - @Column(name = "USEFUL_LIFE") - @ApiParam("有效期") - private Integer usefulLife; -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java deleted file mode 100644 index aefb4cf..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSparePartDetail.java +++ /dev/null @@ -1,69 +0,0 @@ -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: joke.wang - * @CreateDate: 2019\10\10 0010 11:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SPARE_PART_DETAIL") -@Api("MES_备件明细") -public class MesSparePartDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1229825292839375978L; - @Column(name = "SP_NO") - @ApiParam("备件编号") - private String spNo; - - @Column(name = "SP_CODE") - @ApiParam("备件代码") - private String spCode; - - @Column(name = "SP_NAME") - @ApiParam("备件名称") - private String spName; - - @Column(name = "ZONE_NO") - @ApiParam("存储区代码") - private String zoneNo; - - @Column(name = "LOCATE_NO") - @ApiParam("库位编号") - private String locateNo; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "QTY") - @ApiParam("数量") - private Integer qty; - - @Column(name="RECEIVE_DATE") - @ApiParam(value ="接收日期") - private Date receiveDate; - - @Column(name="ENABLE_DATE") - @ApiParam(value ="启用日期") - private Date enableDate; -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java deleted file mode 100644 index 845061d..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesZones.java +++ /dev/null @@ -1,40 +0,0 @@ -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: joke.wang - * @CreateDate: 2019\10\10 0010 11:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ZONES") -@Api("MES_存储区") -public class MesZones extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1229825293041375298L; - @Column(name = "ZONE_NO") - @ApiParam("存储区代码") - private String zoneNo; - - @Column(name = "ZONE_NAME") - @ApiParam("存储区名称") - private String zoneName; -}