diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index 2bb8b09..fe8e4eb 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-andon
jar
+ 1.0-${profileActive}-SNAPSHOT
@@ -49,7 +50,7 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index 4591fe3..f1e9991 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-aps
jar
+ 1.0-${profileActive}-SNAPSHOT
@@ -53,7 +54,7 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 0e3621b..2183cdf 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-base
jar
+ 1.0-${profileActive}-SNAPSHOT
@@ -71,7 +72,7 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index 4d0a808..65c6554 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-form
jar
+ 1.0-${profileActive}-SNAPSHOT
@@ -50,6 +51,6 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index ecf48ed..a1664bf 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-hardswitch
jar
+ 1.0-${profileActive}-SNAPSHOT
dev
@@ -42,7 +43,7 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index 2241e93..6a55282 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-jobflow
jar
+ 1.0-${profileActive}-SNAPSHOT
dev
@@ -42,7 +43,7 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index c9fd4ee..232becd 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-lac
jar
+ 1.0-${profileActive}-SNAPSHOT
@@ -49,7 +50,7 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index 27731be..e65f727 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-mes-pcn
jar
+ 1.0-${profileActive}-SNAPSHOT
@@ -49,7 +50,7 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 2ba9ddd..552f97e 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-mes
jar
+ 1.0-${profileActive}-SNAPSHOT
@@ -49,7 +50,7 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java
new file mode 100644
index 0000000..12e6ad0
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java
@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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;
+
+/**
+ * @Description : MES_容器
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-03-27 14:29
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CONTAINER")
+@Api("MES_容器类型")
+public class MesContainer extends BaseBean {
+ private static final long serialVersionUID = -3843389042411645111L;
+
+ @Column(name = "CT_NO")
+ @ApiParam(value = "容器编号")
+ private String ctNo;
+
+ @Column(name = "CT_CODE")
+ @ApiParam(value = "容器类型代码")
+ private String ctCode;
+
+ @Column(name = "USE_STATUS")
+ @ApiParam(value = "使用状态")
+ private String useStatus;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java
new file mode 100644
index 0000000..b317f3c
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java
@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+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;
+
+/**
+ * @Description : MES_容器类型
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-03-27 14:24
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CONTAINER_TYPE")
+@Api("MES_容器类型")
+public class MesContainerType extends BaseBean {
+
+ private static final long serialVersionUID = 2831600566482383573L;
+
+ @Column(name = "CT_CODE")
+ @ApiParam(value = "容器类型代码")
+ private String ctCode;
+
+ @Column(name = "CT_NAME")
+ @ApiParam(value = "容器类型名称")
+ private String ctName;
+
+ @Column(name = "USE_LIMIT")
+ @ApiParam(value = "使用期限")
+ private Integer useLimit;
+
+ @Column(name = "IS_RECYCLE")
+ @ApiParam(value = "是否回收")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+ private Integer isRecycle;
+
+ @Column(name = "LIMIT_UOM")
+ @ApiParam(value = "期限单位")
+ private String limitUom;
+}
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index 3fd87ac..beba8ba 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-model
jar
+ 1.0-${profileActive}-SNAPSHOT
@@ -90,7 +91,7 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index c0524de..8f191db 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-platform
jar
+ 1.0-${profileActive}-SNAPSHOT
@@ -49,7 +50,7 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index 4b73b1a..f0a5b7e 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-ptl
jar
+ 1.0-${profileActive}-SNAPSHOT
@@ -49,6 +50,6 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index 4ebc2f7..d9d461d 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-report
jar
+ 1.0-${profileActive}-SNAPSHOT
@@ -50,6 +51,6 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index b3c4fc8..309d149 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-softswitch
jar
+ 1.0-${profileActive}-SNAPSHOT
@@ -50,6 +51,6 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index b601666..f34bc03 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-sweb
jar
+ 1.0-${profileActive}-SNAPSHOT
@@ -49,7 +50,7 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index 2d56516..f9e982f 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-wms
jar
+ 1.0-${profileActive}-SNAPSHOT
@@ -53,7 +54,7 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index 4395f3c..e2918a0 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -12,6 +12,7 @@
i3plus-pojo-workflow
jar
+ 1.0-${profileActive}-SNAPSHOT
dev
@@ -42,7 +43,7 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 96a06e4..c7523d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
i3plus.pojo
i3plus-pojo
pom
- 1.0-SNAPSHOT
+ 1.0-${profileActive}-SNAPSHOT
modules/i3plus-pojo-base
modules/i3plus-pojo-platform
@@ -252,6 +252,6 @@
- ${project.artifactId}-${profileActive}-${project.version}
+ ${project.artifactId}-${project.version}
\ No newline at end of file