Merge branch 'dev' into test

yun-zuoyi
王杰 5 years ago
commit 7514f66953

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-andon</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>
@ -49,7 +50,7 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-aps</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>
@ -53,7 +54,7 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-base</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
@ -71,7 +72,7 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-form</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
@ -50,6 +51,6 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-hardswitch</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<profiles>
<profile>
<id>dev</id>
@ -42,7 +43,7 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-jobflow</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<profiles>
<profile>
<id>dev</id>
@ -42,7 +43,7 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-lac</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>
@ -49,7 +50,7 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-mes-pcn</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>
@ -49,7 +50,7 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-mes</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>
@ -49,7 +50,7 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>

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

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

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-model</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>
@ -90,7 +91,7 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-platform</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>
@ -49,7 +50,7 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-ptl</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>
@ -49,6 +50,6 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-report</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
@ -50,6 +51,6 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-softswitch</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
@ -50,6 +51,6 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-sweb</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>
@ -49,7 +50,7 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-wms</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>
@ -53,7 +54,7 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-workflow</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<profiles>
<profile>
<id>dev</id>
@ -42,7 +43,7 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<version>1.0-${profileActive}-SNAPSHOT</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>
@ -252,6 +252,6 @@
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>
Loading…
Cancel
Save