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

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

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

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

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

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")
@@ -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;
-    }
 }

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

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")
@@ -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;
-    }
 }