新增区域、区段、标签控制器、标签信息、BOM和物料 基础数据

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;
+    }
 }

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;
+    }
 }

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;
+    }
 }

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;
+    }
+}

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;
+    }
 }

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;
+    }
 }

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<PtlArea, Long> {
+
+}

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<PtlBom, Long> {
+
+}

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<PtlPart, Long> {
+
+}

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<PtlSection, Long> {
+
+}