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] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8C=BA=E5=9F=9F=E3=80=81?= =?UTF-8?q?=E5=8C=BA=E6=AE=B5=E3=80=81=E6=A0=87=E7=AD=BE=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8=E3=80=81=E6=A0=87=E7=AD=BE=E4=BF=A1=E6=81=AF=E3=80=81?= =?UTF-8?q?BOM=E5=92=8C=E7=89=A9=E6=96=99=20=E5=9F=BA=E7=A1=80=E6=95=B0?= =?UTF-8?q?=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; - } }