diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index 004fb69..bc7071b 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index 9302dfc..3d6cbc0 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index a933723..96472ad 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -5,14 +5,14 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-base
jar
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 7e9ef99..366bf4d 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -6611,4 +6611,61 @@ public class WmsEnumUtil {
return valueOf(val);
}
}
+
+
+ /**
+ * 返修、挑选状态
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum BOM_TYPE {
+ INIT(10, "PART", "物料"),
+ BE_HANDLE(20, "OUT", "委外"),
+ FINISH(30, "UTENSIL", "器具");
+
+ private int value;
+ private String code;
+ private String description;
+
+ BOM_TYPE(int value, String code, String description) {
+ this.value = value;
+ this.code = code;
+ this.description = description;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ 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-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index 712a842..3937425 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index a44418c..e12eaee 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml
index 375d0fd..5bfdd66 100644
--- a/modules/i3plus-pojo-ics/pom.xml
+++ b/modules/i3plus-pojo-ics/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index d1ea30d..8b15a31 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 50ab2c2..7637865 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index a2bb2df..f9957c9 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -5,14 +5,14 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-mes-pcn
jar
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 8664dd2..409b79a 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,14 +5,14 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-mes
jar
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java
index 98d4fc0..39063b7 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.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;
import java.math.BigDecimal;
@@ -93,6 +94,7 @@ public class IfDismantleRecord extends BaseBean implements Serializable {
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
+ @Lob
private String errorMessage;
@Column(name = "ACTION_CODE")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java
index 0549d1f..49363f3 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.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;
@@ -84,6 +85,7 @@ public class IfPackageDetail extends BaseBean implements Serializable {
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
+ @Lob
private String errorMessage;
@Column(name = "ACTION_CODE")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
index 040228e..ddc37ba 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.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;
@@ -96,6 +97,7 @@ public class IfProductOffLine extends BaseBean implements Serializable {
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
+ @Lob
private String errorMessage;
@Column(name = "ACTION_CODE")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
index 91972fb..f7a2098 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
@@ -11,6 +11,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;
@@ -93,6 +94,7 @@ public class IfQueueShipping extends BaseBean implements Serializable {
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
+ @Lob
private String errorMessage;
@Column(name = "ACTION_CODE")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java
index acc8c22..bb50de6 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.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;
@@ -75,6 +76,7 @@ public class IfRawPartData extends BaseBean implements Serializable {
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
+ @Lob
private String errorMessage;
@Column(name = "ACTION_CODE")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java
index df240bc..221abea 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java
@@ -11,6 +11,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;
@@ -47,6 +48,7 @@ public class IfWmsPpm extends BaseBean implements Serializable {
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
+ @Lob
private String errorMessage;
@Column(name = "ACTION_CODE")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java
index bd154b1..627f7c1 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java
@@ -62,7 +62,7 @@ public class MesPatternJis extends BaseBean implements Serializable {
@Lob
@Column(name = "MATCH_RULE")
- @ApiParam("规则")
+ @ApiParam("匹配规则")
private String matchRule;
}
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index 265f98d..846c302 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -5,14 +5,14 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-model
jar
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index 0080b0c..23f68bd 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index 24de8cf..28cf55f 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index 0fbfb69..26a7311 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 069a4e2..1b72275 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -5,14 +5,14 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-softswitch
jar
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 590b56c..910d630 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index ac9e7dd..e5b4e5c 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
index c87d03b..14d7a05 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
@@ -112,6 +112,14 @@ public class WmsBom extends BaseBean {
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String terminalNo;
+
+ @Column(name = "BOM_TYPE")
+ @ApiParam(value = "BOM类型")
+ @ColumnDefault("10")
+ @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 1)
+ @AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description")
+ private Integer bomType;
+
@ApiParam(value = "目标存储区")
@Transient
public String destZoneNo;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java
index 6475e26..3456584 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java
@@ -115,6 +115,13 @@ public class WmsBomHistory extends BaseBean {
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String newBomVersion;
+ @Column(name = "BOM_TYPE")
+ @ApiParam(value = "BOM类型")
+ @ColumnDefault("10")
+ @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 1)
+ @AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description")
+ private Integer bomType;
+
@ApiParam(value = "目标存储区")
@Transient
public String destZoneNo;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java
index 8d9a807..17c421d 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java
@@ -10,7 +10,11 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
-import javax.persistence.*;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
import java.util.List;
@@ -71,7 +75,7 @@ public class WmsTransportRule extends BaseBean {
public String partNo;
@Column(name = "CUST_NO")
- @ApiParam("客户代码")
+ @ApiParam("客户编号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
public String custNo;
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index f153994..0ecf190 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/pom.xml b/pom.xml
index 1bef72c..fbbe86f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
i3plus.pojo
i3plus-pojo
pom
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
modules/i3plus-pojo-base
modules/i3plus-pojo-platform
diff --git a/sonar-project.properties b/sonar-project.properties
index 55e4e84..932bdd9 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
# defaults to project key
sonar.projectName=i3plus-pojo
# defaults to 'not provided'
-sonar.projectVersion=1.0-DEV-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
# Path is relative to the sonar-project.properties file. Defaults to .
#sonar.sources=./