From 60ad38649da1ee862b870b5da2a16d16fbe6aa35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 25 Feb 2020 17:27:23 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E3=80=81=E5=8C=BA=E6=AE=B5=E3=80=81=E6=A0=87=E7=AD=BE=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=99=A8=E3=80=81=E6=A0=87=E7=AD=BE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=81BOM=E5=92=8C=E7=89=A9=E6=96=99=20=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java | 19 +++ .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java | 110 +++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java | 74 +++++++++++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java | 85 +++++++++++++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java | 38 ++++++ .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java | 136 +++++++++++++++++++++ .../pojo/ptl/repository/PtlAreaRepository.java | 17 +++ .../pojo/ptl/repository/PtlBomRepository.java | 17 +++ .../pojo/ptl/repository/PtlPartRepository.java | 17 +++ .../pojo/ptl/repository/PtlSectionRepository.java | 17 +++ 10 files changed, 530 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlBomRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPartRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSectionRepository.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java index 6ed50ee..ebae81c 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java @@ -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,10 +34,27 @@ 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; + public String getAreaNo() { + return areaNo; + } + + public void setAreaNo(String areaNo) { + this.areaNo = areaNo; + } + + public String getAreaName() { + return areaName; + } + + public void setAreaName(String areaName) { + this.areaName = areaName; + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java index b70e8ff..a503231 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java @@ -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,157 @@ 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; + + public String getPartNo() { + return partNo; + } + + public void setPartNo(String partNo) { + this.partNo = partNo; + } + + public String getPartName() { + return partName; + } + + public void setPartName(String partName) { + this.partName = partName; + } + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } + + public Double getQty() { + return qty; + } + + public void setQty(Double qty) { + this.qty = qty; + } + + public String getItemPartNo() { + return itemPartNo; + } + + public void setItemPartNo(String itemPartNo) { + this.itemPartNo = itemPartNo; + } + + public String getItemPartName() { + return itemPartName; + } + + public void setItemPartName(String itemPartName) { + this.itemPartName = itemPartName; + } + + public String getItemUnit() { + return itemUnit; + } + + public void setItemUnit(String itemUnit) { + this.itemUnit = itemUnit; + } + + public Integer getItemQty() { + return itemQty; + } + + public void setItemQty(Integer itemQty) { + this.itemQty = itemQty; + } + + public String getBomNum() { + return bomNum; + } + + public void setBomNum(String bomNum) { + this.bomNum = bomNum; + } + + public String getBomVersion() { + return bomVersion; + } + + public void setBomVersion(String bomVersion) { + this.bomVersion = bomVersion; + } + + public Date getEffStartTime() { + return effStartTime; + } + + public void setEffStartTime(Date effStartTime) { + this.effStartTime = effStartTime; + } + + public Date getEffEndTime() { + return effEndTime; + } + + public void setEffEndTime(Date effEndTime) { + this.effEndTime = effEndTime; + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java index aff681a..4bacb4f 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java @@ -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,105 @@ 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; + public String getControlNo() { + return controlNo; + } + + public void setControlNo(String controlNo) { + this.controlNo = controlNo; + } + + public String getControlName() { + return controlName; + } + + public void setControlName(String controlName) { + this.controlName = controlName; + } + + public Integer getControlType() { + return controlType; + } + + public void setControlType(Integer controlType) { + this.controlType = controlType; + } + + public String getIp() { + return ip; + } + + public void setIp(String ip) { + this.ip = ip; + } + + public String getPort() { + return port; + } + + public void setPort(String port) { + this.port = port; + } + + public String getAreaNo() { + return areaNo; + } + + public void setAreaNo(String areaNo) { + this.areaNo = areaNo; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Integer getFrequency() { + return frequency; + } + + public void setFrequency(Integer frequency) { + this.frequency = frequency; + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java new file mode 100644 index 0000000..5fa6743 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java @@ -0,0 +1,85 @@ +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.TEXT) + private String partType; + + @Column(name = "UNIT") + @ApiParam("单位") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String unit; + + public String getPartNo() { + return partNo; + } + + public void setPartNo(String partNo) { + this.partNo = partNo; + } + + public String getPartName() { + return partName; + } + + public void setPartName(String partName) { + this.partName = partName; + } + + public String getPartType() { + return partType; + } + + public void setPartType(String partType) { + this.partType = partType; + } + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java index 41c6497..6fc43bb 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java @@ -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,53 @@ 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; + + public String getSectionNo() { + return sectionNo; + } + + public void setSectionNo(String sectionNo) { + this.sectionNo = sectionNo; + } + + public String getSectionName() { + return sectionName; + } + + public void setSectionName(String sectionName) { + this.sectionName = sectionName; + } + + public Integer getSectionSeq() { + return sectionSeq; + } + + public void setSectionSeq(Integer sectionSeq) { + this.sectionSeq = sectionSeq; + } + + public String getAreaNo() { + return areaNo; + } + + public void setAreaNo(String areaNo) { + this.areaNo = areaNo; + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java index 9edeec3..6362be4 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java @@ -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,196 @@ 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.TEXT) 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; + public Integer getTagNo() { + return tagNo; + } + + public void setTagNo(Integer tagNo) { + this.tagNo = tagNo; + } + + public String getControlNo() { + return controlNo; + } + + public void setControlNo(String controlNo) { + this.controlNo = controlNo; + } + + public String getAreaNo() { + return areaNo; + } + + public void setAreaNo(String areaNo) { + this.areaNo = areaNo; + } + + public String getSectionNo() { + return sectionNo; + } + + public void setSectionNo(String sectionNo) { + this.sectionNo = sectionNo; + } + + public String getPartNo() { + return partNo; + } + + public void setPartNo(String partNo) { + this.partNo = partNo; + } + + public String getBinNo() { + return binNo; + } + + public void setBinNo(String binNo) { + this.binNo = binNo; + } + + public Integer getTagType() { + return tagType; + } + + public void setTagType(Integer tagType) { + this.tagType = tagType; + } + + public Integer getLightStatus() { + return lightStatus; + } + + public void setLightStatus(Integer lightStatus) { + this.lightStatus = lightStatus; + } + + public Integer getTagStatus() { + return tagStatus; + } + + public void setTagStatus(Integer tagStatus) { + this.tagStatus = tagStatus; + } + + public Integer getLightMode() { + return lightMode; + } + + public void setLightMode(Integer lightMode) { + this.lightMode = lightMode; + } + + public Integer getLightColor() { + return lightColor; + } + + public void setLightColor(Integer lightColor) { + this.lightColor = lightColor; + } + + public Integer getIsBuzzing() { + return isBuzzing; + } + + public void setIsBuzzing(Integer isBuzzing) { + this.isBuzzing = isBuzzing; + } + + public Integer getMusicType() { + return musicType; + } + + public void setMusicType(Integer musicType) { + this.musicType = musicType; + } + + public String getDisplayContent() { + return displayContent; + } + + public void setDisplayContent(String displayContent) { + this.displayContent = displayContent; + } + + public Integer getErrorCount() { + return errorCount; + } + + public void setErrorCount(Integer errorCount) { + this.errorCount = errorCount; + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaRepository.java new file mode 100644 index 0000000..eb93f31 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaRepository.java @@ -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 { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlBomRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlBomRepository.java new file mode 100644 index 0000000..f9feea8 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlBomRepository.java @@ -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 { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPartRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPartRepository.java new file mode 100644 index 0000000..a0eb53d --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPartRepository.java @@ -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 { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSectionRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSectionRepository.java new file mode 100644 index 0000000..bb8db60 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSectionRepository.java @@ -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 { + +} From 896bd9b35b05817976201aa7219d57376a672a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 25 Feb 2020 18:06:04 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlEnumUtil.java | 323 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java | 2 +- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java | 2 +- 3 files changed, 325 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index 465551f..f8e7e86 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -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,325 @@ 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 int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private PTL_PART_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; + } + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java index 5fa6743..ec95884 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java @@ -43,7 +43,7 @@ public class PtlPart extends BaseBean implements Serializable { @Column(name = "PART_TYPE") @ApiParam("物料类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_PART_TYPE") private String partType; @Column(name = "UNIT") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java index 6362be4..f3d4028 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java @@ -64,7 +64,7 @@ public class PtlTag extends BaseBean implements Serializable { @Column(name = "TAG_TYPE") @ApiParam("标签类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_TAG_TYPE") private Integer tagType; @Column(name = "LIGHT_STATUS") From 0fe0abff638da832d93816bfd4bf23a5f1f1e382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 25 Feb 2020 18:16:16 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E3=80=81=E5=8C=BA=E6=AE=B5=E3=80=81=E6=A0=87=E7=AD=BE=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=99=A8=E3=80=81=E6=A0=87=E7=AD=BE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=81BOM=E5=92=8C=E7=89=A9=E6=96=99=20=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlEnumUtil.java | 32 ++++-- .../cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java | 15 --- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java | 96 ----------------- .../cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java | 63 ----------- .../cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java | 31 ------ .../cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java | 31 ------ .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java | 119 --------------------- 7 files changed, 21 insertions(+), 366 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index f8e7e86..01a5863 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -300,14 +300,19 @@ public class PtlEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PTL_PART_TYPE { - RAW_MATERIAL(10, "原材料"), - PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), - FINISHED_PRODUCT(30, "成品"); + RAW_MATERIAL("10", "原材料"), + PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), + FINISHED_PRODUCT("30", "成品"); - private int value; + private String value; private String description; - public int getValue() { + PTL_PART_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { return value; } @@ -315,16 +320,21 @@ public class PtlEnumUtil { return description; } - private PTL_PART_TYPE(int value, String description) { - this.value = value; - this.description = 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 valueOf(int val) { + public static String descriptionOfValue(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; + if (values()[i].description.equals(val)) { + tmp = values()[i].value; } } return tmp; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java index ebae81c..0ed78f0 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java @@ -42,19 +42,4 @@ public class PtlArea extends BaseBean implements Serializable { @ApiParam("区域名称") private String areaName; - public String getAreaNo() { - return areaNo; - } - - public void setAreaNo(String areaNo) { - this.areaNo = areaNo; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java index a503231..888e778 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java @@ -89,100 +89,4 @@ public class PtlBom extends BaseBean implements Serializable { @ApiParam("有效截止日期") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) private Date effEndTime; - - public String getPartNo() { - return partNo; - } - - public void setPartNo(String partNo) { - this.partNo = partNo; - } - - public String getPartName() { - return partName; - } - - public void setPartName(String partName) { - this.partName = partName; - } - - public String getUnit() { - return unit; - } - - public void setUnit(String unit) { - this.unit = unit; - } - - public Double getQty() { - return qty; - } - - public void setQty(Double qty) { - this.qty = qty; - } - - public String getItemPartNo() { - return itemPartNo; - } - - public void setItemPartNo(String itemPartNo) { - this.itemPartNo = itemPartNo; - } - - public String getItemPartName() { - return itemPartName; - } - - public void setItemPartName(String itemPartName) { - this.itemPartName = itemPartName; - } - - public String getItemUnit() { - return itemUnit; - } - - public void setItemUnit(String itemUnit) { - this.itemUnit = itemUnit; - } - - public Integer getItemQty() { - return itemQty; - } - - public void setItemQty(Integer itemQty) { - this.itemQty = itemQty; - } - - public String getBomNum() { - return bomNum; - } - - public void setBomNum(String bomNum) { - this.bomNum = bomNum; - } - - public String getBomVersion() { - return bomVersion; - } - - public void setBomVersion(String bomVersion) { - this.bomVersion = bomVersion; - } - - public Date getEffStartTime() { - return effStartTime; - } - - public void setEffStartTime(Date effStartTime) { - this.effStartTime = effStartTime; - } - - public Date getEffEndTime() { - return effEndTime; - } - - public void setEffEndTime(Date effEndTime) { - this.effEndTime = effEndTime; - } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java index 4bacb4f..7dfbfcc 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java @@ -73,67 +73,4 @@ public class PtlControl extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer frequency; - public String getControlNo() { - return controlNo; - } - - public void setControlNo(String controlNo) { - this.controlNo = controlNo; - } - - public String getControlName() { - return controlName; - } - - public void setControlName(String controlName) { - this.controlName = controlName; - } - - public Integer getControlType() { - return controlType; - } - - public void setControlType(Integer controlType) { - this.controlType = controlType; - } - - public String getIp() { - return ip; - } - - public void setIp(String ip) { - this.ip = ip; - } - - public String getPort() { - return port; - } - - public void setPort(String port) { - this.port = port; - } - - public String getAreaNo() { - return areaNo; - } - - public void setAreaNo(String areaNo) { - this.areaNo = areaNo; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public Integer getFrequency() { - return frequency; - } - - public void setFrequency(Integer frequency) { - this.frequency = frequency; - } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java index ec95884..3cd1329 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java @@ -51,35 +51,4 @@ public class PtlPart extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String unit; - public String getPartNo() { - return partNo; - } - - public void setPartNo(String partNo) { - this.partNo = partNo; - } - - public String getPartName() { - return partName; - } - - public void setPartName(String partName) { - this.partName = partName; - } - - public String getPartType() { - return partType; - } - - public void setPartType(String partType) { - this.partType = partType; - } - - public String getUnit() { - return unit; - } - - public void setUnit(String unit) { - this.unit = unit; - } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java index 6fc43bb..451d554 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java @@ -52,35 +52,4 @@ public class PtlSection extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String areaNo; - public String getSectionNo() { - return sectionNo; - } - - public void setSectionNo(String sectionNo) { - this.sectionNo = sectionNo; - } - - public String getSectionName() { - return sectionName; - } - - public void setSectionName(String sectionName) { - this.sectionName = sectionName; - } - - public Integer getSectionSeq() { - return sectionSeq; - } - - public void setSectionSeq(Integer sectionSeq) { - this.sectionSeq = sectionSeq; - } - - public String getAreaNo() { - return areaNo; - } - - public void setAreaNo(String areaNo) { - this.areaNo = areaNo; - } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java index f3d4028..5044a8b 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java @@ -107,123 +107,4 @@ public class PtlTag extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer errorCount; - public Integer getTagNo() { - return tagNo; - } - - public void setTagNo(Integer tagNo) { - this.tagNo = tagNo; - } - - public String getControlNo() { - return controlNo; - } - - public void setControlNo(String controlNo) { - this.controlNo = controlNo; - } - - public String getAreaNo() { - return areaNo; - } - - public void setAreaNo(String areaNo) { - this.areaNo = areaNo; - } - - public String getSectionNo() { - return sectionNo; - } - - public void setSectionNo(String sectionNo) { - this.sectionNo = sectionNo; - } - - public String getPartNo() { - return partNo; - } - - public void setPartNo(String partNo) { - this.partNo = partNo; - } - - public String getBinNo() { - return binNo; - } - - public void setBinNo(String binNo) { - this.binNo = binNo; - } - - public Integer getTagType() { - return tagType; - } - - public void setTagType(Integer tagType) { - this.tagType = tagType; - } - - public Integer getLightStatus() { - return lightStatus; - } - - public void setLightStatus(Integer lightStatus) { - this.lightStatus = lightStatus; - } - - public Integer getTagStatus() { - return tagStatus; - } - - public void setTagStatus(Integer tagStatus) { - this.tagStatus = tagStatus; - } - - public Integer getLightMode() { - return lightMode; - } - - public void setLightMode(Integer lightMode) { - this.lightMode = lightMode; - } - - public Integer getLightColor() { - return lightColor; - } - - public void setLightColor(Integer lightColor) { - this.lightColor = lightColor; - } - - public Integer getIsBuzzing() { - return isBuzzing; - } - - public void setIsBuzzing(Integer isBuzzing) { - this.isBuzzing = isBuzzing; - } - - public Integer getMusicType() { - return musicType; - } - - public void setMusicType(Integer musicType) { - this.musicType = musicType; - } - - public String getDisplayContent() { - return displayContent; - } - - public void setDisplayContent(String displayContent) { - this.displayContent = displayContent; - } - - public Integer getErrorCount() { - return errorCount; - } - - public void setErrorCount(Integer errorCount) { - this.errorCount = errorCount; - } } From 2c305e0ca645a0e448cc492cf9b3ffec07ecd71e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 26 Feb 2020 09:13:54 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E7=B1=BB=E5=90=8D=E5=A4=A7=E5=86=99=EF=BC=88=E9=83=A8?= =?UTF-8?q?=E5=88=86=EF=BC=89=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 8ae1488..c5da101 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -468,7 +468,7 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TagType { + public enum TAG_TYPE { BIN_TAG(10, "库位标签"), FINALIZER_TAG(20, "完成器标签"), SCREEN_TAG(30, "标签显示器"), @@ -477,7 +477,7 @@ public class PtlPcnEnumUtil { private int value; private String description; - TagType(int value, String description) { + TAG_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -694,7 +694,7 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum StatusType { + public enum STATUS_TYPE { START(10, "START", "开始状态"), FINISH(20, "FINISH", "完成状态"), TERMINATE(30, "TERMINATE", "中断状态"); @@ -703,7 +703,7 @@ public class PtlPcnEnumUtil { private String code; private String description; - StatusType(int value, String code, String description) { + STATUS_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; From cac0f911502e9f2bfbb76a0d2505a9dd5aa33db2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 26 Feb 2020 09:15:03 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0BOM=E4=B8=AD=E7=88=B6?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=8F=8F=E8=BF=B0=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java index 888e778..ea940a6 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java @@ -35,7 +35,7 @@ public class PtlBom extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partNo; - @Column(name = "PART_NAME") + @Column(name = "PART_NAME", columnDefinition = "varchar(20) default '1'", nullable = false) @ApiParam("父物料描述") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partName; From d56756e9e5f7c168693fbb9a666b85da75dfb2ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 26 Feb 2020 11:06:08 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=BB=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=81=E5=8C=BA=E5=9F=9F=E3=80=81=E5=8C=BA=E6=AE=B5?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlEnumUtil.java | 85 +++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index 01a5863..072df9e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -307,7 +307,7 @@ public class PtlEnumUtil { private String value; private String description; - PTL_PART_TYPE(String value, String description) { + private PTL_PART_TYPE(String value, String description) { this.value = value; this.description = description; } @@ -340,4 +340,87 @@ public class PtlEnumUtil { return tmp; } } + + /** + * 任务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_TASK_TYPE { + JIT_TASK("10", "JIT任务"), + BILL_TASK("20", "单据任务"), + SINGLE_POINT_TASK("30", "单点任务"); + + private String value; + private String description; + + private PTL_TASK_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; + } + } + + /** + * 任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_TASK_STATUS { + CREATE(10, "创建"), + EXECUTION(20, "执行中"), + COMPLETE(30, "完成"), + CANCEL(40, "取消"); + + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private PTL_TASK_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; + } + } } From f01b3664c2c741f71aff64a38104cde957d0efc9 Mon Sep 17 00:00:00 2001 From: joke Date: Wed, 26 Feb 2020 12:48:35 +0800 Subject: [PATCH 07/12] =?UTF-8?q?[ptl:=2032=20=E4=BA=AE=E7=81=AF=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E7=A8=8B=E5=BA=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 38 ++++++++++++++++++++-- .../pojo/ptl/repository/PtlAreaTaskRepository.java | 14 ++++++++ .../ptl/repository/PtlAreaTaskSeqRepository.java | 14 ++++++++ 3 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskSeqRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 8ae1488..ba57e59 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -593,9 +593,13 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum InterfaceSignalMessageType { - CONNECT_CONTROL_CMD(10, "111111", "connectControlService", "连接控制器"), - DISCONNECT_CONTROL_CMD(20, "222222", "disconnectControlService", "断开控制器"), - LIGHT_ON_CMD(30, "333333", "lightOnService", "亮灯命令"); + CONNECT_CONTROL_CMD(10, "connect", "connectControlService", "连接控制器"), + DISCONNECT_CONTROL_CMD(20, "disconnect", "disconnectControlService", "断开控制器"), + REFRESH_CONTROL_CMD(30, "refresh", "refreshControlService", "刷新"), + UNLOCK_CONTROL_CMD(40, "unlock", "unlockControlService", "解锁"), + LABEL_SELF_CHECK_CONTROL_CMD(50, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"), + LIGHT_DETAIL_CONTROL_CMD(60, "lightDetail", "lightDetailControlService", "亮灯明细"), + SCAN_CONTROL_CMD(60, "scan", "scanControlService", "扫描"); private int value; private String code; @@ -722,4 +726,32 @@ public class PtlPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PtlControlStatus { + CONNECT(10, "CONNECT", "连接"), + DISCONNECT(20, "DISCONNECT", "断开"); + + private int value; + private String code; + private String description; + + PtlControlStatus(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java new file mode 100644 index 0000000..8d649d8 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaTask; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-02-25 11:16 下午 + * @Modify: + **/ +public interface PtlAreaTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskSeqRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskSeqRepository.java new file mode 100644 index 0000000..dfee536 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskSeqRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaTaskSeq; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-02-25 11:18 下午 + * @Modify: + **/ +public interface PtlAreaTaskSeqRepository extends BaseRepository { +} From f362f9931f2d1d9cec5d097315e5f3d82948b1c3 Mon Sep 17 00:00:00 2001 From: joke Date: Wed, 26 Feb 2020 15:42:30 +0800 Subject: [PATCH 08/12] =?UTF-8?q?[ptl:32=20=E4=BA=AE=E7=81=AF=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 94 ++++++++++++++++++++-- 1 file changed, 86 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index f332b67..3c43fe3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -593,13 +593,14 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum InterfaceSignalMessageType { - CONNECT_CONTROL_CMD(10, "connect", "connectControlService", "连接控制器"), - DISCONNECT_CONTROL_CMD(20, "disconnect", "disconnectControlService", "断开控制器"), - REFRESH_CONTROL_CMD(30, "refresh", "refreshControlService", "刷新"), - UNLOCK_CONTROL_CMD(40, "unlock", "unlockControlService", "解锁"), - LABEL_SELF_CHECK_CONTROL_CMD(50, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"), - LIGHT_DETAIL_CONTROL_CMD(60, "lightDetail", "lightDetailControlService", "亮灯明细"), - SCAN_CONTROL_CMD(60, "scan", "scanControlService", "扫描"); + CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), + DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), + REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"), + SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"), + INIT_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"); +// UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"), +// LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"), +// LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细"); private int value; private String code; @@ -644,7 +645,8 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WsBusiType { - MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"); + MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"), + INTERFACE_PROCESS(10, "INTERFACE_PROCESS", "界面处理"); private int value; private String code; @@ -754,4 +756,80 @@ public class PtlPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SectionTaskDetailStatus { + CREATE(10, "CREATE", "创建"), + COMPLETE(20, "COMPLETE", "完成"); + + private int value; + private String code; + private String description; + + SectionTaskDetailStatus(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + /** + * 生成任务actor message type + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GenTaskMessageType { + GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务"); + + private int value; + private String code; + private String callClass; + private String description; + + GenTaskMessageType(int value, String code, String callClass, String description) { + this.value = value; + this.code = code; + this.callClass = callClass; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCallClass() { + return callClass; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static InterfaceSignalMessageType getTypeByValue(String code) { + if (StringUtils.isEmpty(code)) { + return null; + } + for (InterfaceSignalMessageType enums : InterfaceSignalMessageType.values()) { + if (enums.getCode().equals(code)) { + return enums; + } + } + return null; + } + } + } From 40094365ce73d79021d0ae4e0b915abf5e80b525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 26 Feb 2020 16:22:32 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E3=80=90PTL=5F=E5=8C=BA=E6=AE=B5?= =?UTF-8?q?=E4=BA=AE=E7=81=AF=E4=BB=BB=E5=8A=A1=E6=98=8E=E7=BB=86=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 121 +++++++++++++++++++++ .../pojo/ptl/bean/PtlAreaSectionTaskDetail.java | 2 +- .../repository/PtlAreaSectionTaskRepository.java | 17 +++ .../pojo/ptl/repository/PtlAreaTaskRepository.java | 17 +++ 4 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaSectionTaskRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index c5da101..e67c390 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -482,6 +482,16 @@ public class PtlPcnEnumUtil { 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; + } + public int getValue() { return value; } @@ -722,4 +732,115 @@ public class PtlPcnEnumUtil { } } + /** + * PTL_区段亮灯任务明细状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TASK_DETAIL_STATUS { + CREATE(10, "CREATE", "新建"), + RECEIPT_FINISH(20, "RECEIPT_FINISH", "已完成"); + + private int value; + private String code; + private String description; + + TASK_DETAIL_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return 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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * PTL_区段、区域亮灯任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AREA_SECTION_TASKL_STATUS { + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "执行中"), + RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"); + + private int value; + private String code; + private String description; + + AREA_SECTION_TASKL_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return 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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java index 60f05df..38103b1 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java @@ -60,7 +60,7 @@ public class PtlAreaSectionTaskDetail extends BaseBean implements Serializable { @Column(name = "QTY") @ApiParam("拣货数量") - private Integer qty; + private Integer qty = 0; @Column(name = "LIGHT_MODE") @ApiParam("亮灯方式") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaSectionTaskRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaSectionTaskRepository.java new file mode 100644 index 0000000..35d74c9 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaSectionTaskRepository.java @@ -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.PtlAreaSectionTask; +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaTask; + +/** + * @Description : 区段亮灯任务 + * @author : jessica.chen + * @date : 2020-02-26 13:49 + * @desc + */ + +public interface PtlAreaSectionTaskRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java new file mode 100644 index 0000000..deb55b5 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java @@ -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.PtlAreaTask; + +/** + * @Description : 区域亮灯任务 + * @author : jessica.chen + * @date : 2020-02-26 13:49 + * @desc + */ + +public interface PtlAreaTaskRepository extends BaseRepository { + +} From 35efadd243009c56ea733c1f93f1664296c4ef5b Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 27 Feb 2020 09:51:09 +0800 Subject: [PATCH 10/12] =?UTF-8?q?ptl=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 3c43fe3..645d780 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -546,7 +546,7 @@ public class PtlPcnEnumUtil { CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"), - LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "", "灭灯命令"), + LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "lightOffService", "灭灯命令"), CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"), INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回"); From ab9e9a8638883b101897ff00bf103748aa3776f5 Mon Sep 17 00:00:00 2001 From: joke Date: Thu, 27 Feb 2020 10:01:19 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 121 +++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 3c43fe3..b353195 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -482,6 +482,16 @@ public class PtlPcnEnumUtil { 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; + } + public int getValue() { return value; } @@ -832,4 +842,115 @@ public class PtlPcnEnumUtil { } } + /** + * PTL_区段亮灯任务明细状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TASK_DETAIL_STATUS { + CREATE(10, "CREATE", "新建"), + RECEIPT_FINISH(20, "RECEIPT_FINISH", "已完成"); + + private int value; + private String code; + private String description; + + TASK_DETAIL_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return 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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * PTL_区段、区域亮灯任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AREA_SECTION_TASKL_STATUS { + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "执行中"), + RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"); + + private int value; + private String code; + private String description; + + AREA_SECTION_TASKL_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return 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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + } From e2d63434dba8bb6a0f27574fbee159149a64f677 Mon Sep 17 00:00:00 2001 From: luweihao Date: Thu, 27 Feb 2020 13:30:33 +0800 Subject: [PATCH 12/12] =?UTF-8?q?bug=20`7570`=20`7561`=20=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=89=A3=E5=87=8F=E4=BB=A3=E7=A0=81=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java index a82b8d4..22810be 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -45,6 +46,7 @@ public class MesPcnSyncErrorLog extends BaseBean implements Serializable { @ApiParam("异常位置") private String errorSpot; + @Lob @Column(name = "ERROR_CONTENT") @ApiParam("异常内容") private String errorContent; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java index 01015d5..5c98174 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -45,6 +46,7 @@ public class MesPcnSyncErrorLog extends BaseBean implements Serializable { @ApiParam("异常位置") private String errorSpot; + @Lob @Column(name = "ERROR_CONTENT") @ApiParam("异常内容") private String errorContent;