Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

yun-zuoyi
许心洁 5 years ago
commit 2a09c009f3

@ -1,5 +1,7 @@
package cn.estsh.i3plus.pojo.base.enumutil;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* @author Wynne.Lu
* @date 2020/2/12 17:41
@ -7,4 +9,335 @@ package cn.estsh.i3plus.pojo.base.enumutil;
*/
public class PtlEnumUtil {
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_TAG_TYPE {
LOCATION_TAG(10, "库位标签"),
COMPLATE_TAG(20, "完成器标签"),
TAG_MONITOR(30, "标签显示器"),
TAG_SCAN_INTERFACE(40, "标签扫描接口");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private PTL_TAG_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_LIGHT_STATUS {
LIGHT_OFF(10, "灭灯"),
COMPLATE_ON(20, "亮点");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private PTL_LIGHT_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_TAG_STATUS {
NORMAL(10, "正常"),
UNAVAILABLE(20, "不可用");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private PTL_TAG_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_LIGHT_MODE {
LIGHT(10, "常亮"),
TWINKLE(20, "闪烁");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private PTL_LIGHT_MODE(int value, String description) {
this.value = value;
this.description = description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_LIGHT_COLOR {
WHITE(10, "白色"),
RED(20, "红色"),
GREEN(30, "绿色"),
BLUE(40, "蓝色"),
YELLOW(50, "黄色");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private PTL_LIGHT_COLOR(int value, String description) {
this.value = value;
this.description = description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_IS_BUZZING {
YES(1, "是"),
NO(2, "否");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private PTL_IS_BUZZING(int value, String description) {
this.value = value;
this.description = description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_CONTROL_TYPE {
ATOP(10, "上尚"),
AIOI(20, "爱欧");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private PTL_CONTROL_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_CONTROL_STATUS {
CONNECT(10, "连接"),
BREAK(20, "断开");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private PTL_CONTROL_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_PART_TYPE {
RAW_MATERIAL("10", "原材料"),
PARTIALLY_PREPARED_PRODUCTS("20", "半成品"),
FINISHED_PRODUCT("30", "成品");
private String value;
private String description;
PTL_PART_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;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

@ -1,7 +1,9 @@
package cn.estsh.i3plus.pojo.ptl.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -32,9 +34,11 @@ public class PtlArea extends BaseBean implements Serializable {
@Column(name = "AREA_NO")
@ApiParam("区域代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String areaNo;
@Column(name = "AREA_NAME")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("区域名称")
private String areaName;

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.ptl.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -30,49 +32,61 @@ public class PtlBom extends BaseBean implements Serializable {
@Column(name = "PART_NO")
@ApiParam("父物料号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("父物料描述")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partName;
@Column(name = "UNIT")
@ApiParam("计量单位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String unit;
@Column(name = "QTY")
@ApiParam("数量")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private Double qty;
@Column(name = "ITEM_PART_NO")
@ApiParam("子物料号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String itemPartNo;
@Column(name = "ITEM_PART_NAME")
@ApiParam("子物料描述")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String itemPartName;
@Column(name = "ITEM_UNIT")
@ApiParam("子计量单位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String itemUnit;
@Column(name = "ITEM_QTY")
@ApiParam("子用量")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private Integer itemQty;
@Column(name = "BOM_NUM")
@ApiParam("BOM编号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String bomNum;
@Column(name = "BOM_VERSION")
@ApiParam("BOM版本号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String bomVersion;
@Column(name = "EFF_START_TIME")
@ApiParam("有效起始日期")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
private Date effStartTime;
@Column(name = "EFF_END_TIME")
@ApiParam("有效截止日期")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
private Date effEndTime;
}

@ -1,7 +1,10 @@
package cn.estsh.i3plus.pojo.ptl.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.PtlEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -32,34 +35,42 @@ public class PtlControl extends BaseBean implements Serializable {
@Column(name = "CONTROL_NO")
@ApiParam("控制器编号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String controlNo;
@Column(name = "CONTROL_NAME")
@ApiParam("控制器名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String controlName;
@Column(name = "CONTROL_TYPE")
@ApiParam("控制器类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_CONTROL_TYPE")
private Integer controlType;
@Column(name = "IP")
@ApiParam("ip地址")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String ip;
@Column(name = "PORT")
@ApiParam("端口地址")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String port;
@Column(name = "AREA_NO")
@ApiParam("区域代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String areaNo;
@Column(name = "STATUS")
@ApiParam("控制器状态")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_CONTROL_STATUS")
private Integer status;
@Column(name = "FREQUENCY")
@ApiParam("监听频率")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Integer frequency;
}

@ -0,0 +1,54 @@
package cn.estsh.i3plus.pojo.ptl.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
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;
/**
* @author adair.song
* @date 2020/2/25 10:14
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "PTL_PART")
@EqualsAndHashCode(callSuper = true)
@Api("物料")
public class PtlPart extends BaseBean implements Serializable {
private static final long serialVersionUID = -7451758045686558893L;
@Column(name = "PART_NO")
@ApiParam("物料编号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partName;
@Column(name = "PART_TYPE")
@ApiParam("物料类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_PART_TYPE")
private String partType;
@Column(name = "UNIT")
@ApiParam("单位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String unit;
}

@ -1,7 +1,9 @@
package cn.estsh.i3plus.pojo.ptl.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -32,17 +34,22 @@ public class PtlSection extends BaseBean implements Serializable {
@Column(name = "SECTION_NO")
@ApiParam("区段编号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String sectionNo;
@Column(name = "SECTION_NAME")
@ApiParam("区段名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String sectionName;
@Column(name = "SECTION_SEQ")
@ApiParam("区段顺序号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Integer sectionSeq;
@Column(name = "AREA_NO")
@ApiParam("区域代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String areaNo;
}

@ -1,7 +1,9 @@
package cn.estsh.i3plus.pojo.ptl.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -32,62 +34,77 @@ public class PtlTag extends BaseBean implements Serializable {
@Column(name = "TAG_NO")
@ApiParam("标签代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Integer tagNo;
@Column(name = "CONTROL_NO")
@ApiParam("控制器代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String controlNo;
@Column(name = "AREA_NO")
@ApiParam("区域代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String areaNo;
@Column(name = "SECTION_NO")
@ApiParam("区段代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String sectionNo;
@Column(name = "PART_NO")
@ApiParam("物料编号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partNo;
@Column(name = "BIN_NO")
@ApiParam("BIN位代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String binNo;
@Column(name = "TAG_TYPE")
@ApiParam("标签类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_TAG_TYPE")
private Integer tagType;
@Column(name = "LIGHT_STATUS")
@ApiParam("亮灯状态")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_STATUS")
private Integer lightStatus;
@Column(name = "TAG_STATUS")
@ApiParam("标签状态")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_TAG_STATUS")
private Integer tagStatus;
@Column(name = "LIGHT_MODE")
@ApiParam("亮灯状态")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_MODE")
private Integer lightMode;
@Column(name = "LIGHT_COLOR")
@ApiParam("亮灯颜色")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_COLOR")
private Integer lightColor;
@Column(name = "IS_BUZZING")
@ApiParam("是否蜂鸣")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_IS_BUZZING")
private Integer isBuzzing;
@Column(name = "MUSIC_TYPE")
@ApiParam("音乐类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_MUSIC_TYPE")
private Integer musicType;
@Column(name = "DISPLAY_CONTEXT")
@ApiParam("显示内容")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String displayContent;
@Column(name = "ERROR_COUNT")
@ApiParam("卡键次数")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Integer errorCount;
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.ptl.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.ptl.bean.PtlActor;
import cn.estsh.i3plus.pojo.ptl.bean.PtlArea;
import org.springframework.stereotype.Repository;
/**
* @author adair.song
* @date 2020/2/25 11:19
* @desc
*/
@Repository
public interface PtlAreaRepository extends BaseRepository<PtlArea, Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.ptl.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.ptl.bean.PtlArea;
import cn.estsh.i3plus.pojo.ptl.bean.PtlBom;
import org.springframework.stereotype.Repository;
/**
* @author adair.song
* @date 2020/2/25 11:19
* @desc
*/
@Repository
public interface PtlBomRepository extends BaseRepository<PtlBom, Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.ptl.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.ptl.bean.PtlArea;
import cn.estsh.i3plus.pojo.ptl.bean.PtlPart;
import org.springframework.stereotype.Repository;
/**
* @author adair.song
* @date 2020/2/25 11:19
* @desc
*/
@Repository
public interface PtlPartRepository extends BaseRepository<PtlPart, Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.ptl.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.ptl.bean.PtlBom;
import cn.estsh.i3plus.pojo.ptl.bean.PtlSection;
import org.springframework.stereotype.Repository;
/**
* @author adair.song
* @date 2020/2/25 11:19
* @desc
*/
@Repository
public interface PtlSectionRepository extends BaseRepository<PtlSection, Long> {
}
Loading…
Cancel
Save