diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index fe8e4eb..004fb69 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -5,14 +5,13 @@
i3plus-pojo
i3plus.pojo
- 1.0-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-andon
jar
- 1.0-${profileActive}-SNAPSHOT
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index f1e9991..650ee5b 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -5,14 +5,13 @@
i3plus-pojo
i3plus.pojo
- 1.0-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-aps
jar
- 1.0-${profileActive}-SNAPSHOT
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 9f54aca..9f9717e 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -5,14 +5,13 @@
i3plus-pojo
i3plus.pojo
- 1.0-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-base
jar
- 1.0-${profileActive}-SNAPSHOT
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 6bbd855..c08db39 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -4600,4 +4600,49 @@ public class MesEnumUtil {
return tmp;
}
}
+
+ /**
+ * 容器使用状态
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum MES_CONTAINER_STATUS {
+ FREE(10, "空闲"),
+ OCCUPY(20, "占用");
+
+ private int value;
+ private String description;
+
+ MES_CONTAINER_STATUS(int value, String description) {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public static String valueOfDescription(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 String valueOfDescription2(int val) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+ }
+ }
+ return tmp;
+ }
+ }
}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index c87401e..19a03d8 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -3269,4 +3269,49 @@ public class MesPcnEnumUtil {
return tmp;
}
}
+
+ /**
+ * 容器使用状态
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum MES_CONTAINER_STATUS {
+ FREE(10, "空闲"),
+ OCCUPY(20, "占用");
+
+ private int value;
+ private String description;
+
+ MES_CONTAINER_STATUS(int value, String description) {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public static String valueOfDescription(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 String valueOfDescription2(int val) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+ }
+ }
+ return tmp;
+ }
+ }
}
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index 65c6554..a9e288f 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -5,14 +5,13 @@
i3plus-pojo
i3plus.pojo
- 1.0-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-form
jar
- 1.0-${profileActive}-SNAPSHOT
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index 0f73e78..a44418c 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -5,14 +5,13 @@
i3plus-pojo
i3plus.pojo
- 1.0-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-hardswitch
jar
- 1.0-${profileActive}-SNAPSHOT
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index 7e73285..123fdc9 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -5,14 +5,13 @@
i3plus-pojo
i3plus.pojo
- 1.0-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-jobflow
jar
- 1.0-${profileActive}-SNAPSHOT
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 232becd..50ab2c2 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -5,14 +5,13 @@
i3plus-pojo
i3plus.pojo
- 1.0-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-lac
jar
- 1.0-${profileActive}-SNAPSHOT
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index e65f727..d800ecf 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -5,14 +5,13 @@
i3plus-pojo
i3plus.pojo
- 1.0-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-mes-pcn
jar
- 1.0-${profileActive}-SNAPSHOT
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 552f97e..60fc467 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,14 +5,13 @@
i3plus-pojo
i3plus.pojo
- 1.0-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-mes
jar
- 1.0-${profileActive}-SNAPSHOT
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
index ea3a703..fba3a8d 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
@@ -106,6 +106,10 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam("打印缓存id")
private String printId;
+ @Column(name = "CT_NO")
+ @ApiParam("容器编号")
+ private String ctNo;
+
public MesPackage() {
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
index b71bdbd..4c9c79d 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
@@ -132,4 +132,10 @@ public class MesPlc extends BaseBean implements Serializable {
@Column(name = "TOOLING_CODE ")
@ApiParam("工装代码")
private String toolingCode;
+
+
+ @Transient
+ @ApiParam("标签数据")
+ private String tableValue;
+
}
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index beba8ba..d65e031 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -5,14 +5,13 @@
i3plus-pojo
i3plus.pojo
- 1.0-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-model
jar
- 1.0-${profileActive}-SNAPSHOT
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index 8f191db..a785f21 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -5,14 +5,13 @@
i3plus-pojo
i3plus.pojo
- 1.0-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-platform
jar
- 1.0-${profileActive}-SNAPSHOT
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index f0a5b7e..d6d2f8e 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -5,14 +5,13 @@
i3plus-pojo
i3plus.pojo
- 1.0-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-ptl
jar
- 1.0-${profileActive}-SNAPSHOT
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index d9d461d..0fbfb69 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -5,14 +5,13 @@
i3plus-pojo
i3plus.pojo
- 1.0-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-report
jar
- 1.0-${profileActive}-SNAPSHOT
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 309d149..76739f9 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -5,14 +5,13 @@
i3plus-pojo
i3plus.pojo
- 1.0-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-softswitch
jar
- 1.0-${profileActive}-SNAPSHOT
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index f34bc03..0368700 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -5,14 +5,13 @@
i3plus-pojo
i3plus.pojo
- 1.0-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-sweb
jar
- 1.0-${profileActive}-SNAPSHOT
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index f9e982f..b2eedd4 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -5,14 +5,13 @@
i3plus-pojo
i3plus.pojo
- 1.0-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-wms
jar
- 1.0-${profileActive}-SNAPSHOT
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index d561047..5fcd08a 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -5,14 +5,13 @@
i3plus-pojo
i3plus.pojo
- 1.0-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-workflow
jar
- 1.0-${profileActive}-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 7a083c9..ff1cd2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
i3plus.pojo
i3plus-pojo
pom
- 1.0-${profileActive}-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
modules/i3plus-pojo-base
modules/i3plus-pojo-platform