I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
宋军超 5 years ago
parent 45dda6ea57 cbe3094f2a
commit b3032ca8e8
24 changed files with 123 additions and 38 deletions
Show Stats Download Patch File Download Diff File

3
modules/i3plus-pojo-andon/pom.xml
Unescape Escape View File

@ -5,14 +5,13 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-andon</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

3
modules/i3plus-pojo-aps/pom.xml
Unescape Escape View File

@ -5,14 +5,13 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-aps</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

3
modules/i3plus-pojo-base/pom.xml
Unescape Escape View File

@ -5,14 +5,13 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-base</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

45
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

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

45
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

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

3
modules/i3plus-pojo-form/pom.xml
Unescape Escape View File

@ -5,14 +5,13 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-form</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>

3
modules/i3plus-pojo-hardswitch/pom.xml
Unescape Escape View File

@ -5,14 +5,13 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-hardswitch</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<profiles>
<profile>

3
modules/i3plus-pojo-jobflow/pom.xml
Unescape Escape View File

@ -5,14 +5,13 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-jobflow</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<profiles>
<profile>

3
modules/i3plus-pojo-lac/pom.xml
Unescape Escape View File

@ -5,14 +5,13 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-lac</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

3
modules/i3plus-pojo-mes-pcn/pom.xml
Unescape Escape View File

@ -5,14 +5,13 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-mes-pcn</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

3
modules/i3plus-pojo-mes/pom.xml
Unescape Escape View File

@ -5,14 +5,13 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-mes</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
Unescape Escape View File

@ -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() {
}

6
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
Unescape Escape View File

@ -132,4 +132,10 @@ public class MesPlc extends BaseBean implements Serializable {
@Column(name = "TOOLING_CODE ")
@ApiParam("工装代码")
private String toolingCode;
@Transient
@ApiParam("标签数据")
private String tableValue;
}

3
modules/i3plus-pojo-model/pom.xml
Unescape Escape View File

@ -5,14 +5,13 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-model</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

3
modules/i3plus-pojo-platform/pom.xml
Unescape Escape View File

@ -5,14 +5,13 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-platform</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

3
modules/i3plus-pojo-ptl/pom.xml
Unescape Escape View File

@ -5,14 +5,13 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-ptl</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

3
modules/i3plus-pojo-report/pom.xml
Unescape Escape View File

@ -5,14 +5,13 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-report</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>

3
modules/i3plus-pojo-softswitch/pom.xml
Unescape Escape View File

@ -5,14 +5,13 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-softswitch</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>

3
modules/i3plus-pojo-sweb/pom.xml
Unescape Escape View File

@ -5,14 +5,13 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-sweb</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

3
modules/i3plus-pojo-wms/pom.xml
Unescape Escape View File

@ -5,14 +5,13 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-wms</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<dependencies>
<dependency>

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
Unescape Escape View File

@ -28,10 +28,10 @@ import java.math.BigDecimal;
@Index(columnList = "ORDER_NO"),
@Index(columnList = "PART_NO"),
@Index(columnList = "ITEM_STATUS")
}, uniqueConstraints = {@UniqueConstraint(columnNames = {"REF_SRC", "ITEM", "TRANS_TYPE_CODE_RDD"})})
})
// uniqueConstraints = {@UniqueConstraint(columnNames = {"REF_SRC", "ITEM", "TRANS_TYPE_CODE_RDD"})}
@Api("作业任务明细信息")
public class WmsTaskDetails extends BaseBean {
private static final long serialVersionUID = 2938720878619662102L;
@Column(name = "ORDER_NO")
@ApiParam(value = "单号")

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java
Unescape Escape View File

@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.ColumnDefault;
/**
@ -14,6 +15,7 @@ import org.hibernate.annotations.ColumnDefault;
* @Modify:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("移库单数据模型")
public class WmsDocMovementModel {
@ -43,7 +45,7 @@ public class WmsDocMovementModel {
private String partGroupNo;
@ApiParam("订单状态")
private String orderStatus;
private Integer orderStatus;
@ApiParam(value = "优先级", example = "1")
public Integer priority;

3
modules/i3plus-pojo-workflow/pom.xml
Unescape Escape View File

@ -5,14 +5,13 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-workflow</artifactId>
<packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<profiles>
<profile>

2
pom.xml
Unescape Escape View File

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>

Write Preview
Loading…
Cancel
Save