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

Merge branch 'test' into dev

Browse Source
yun-zuoyi
钮海涛 5 years ago
parent ce1dd45842 c6d36af4c9
commit 2e2ee2cc6c
24 changed files with 52 additions and 26 deletions
Show Stats Download Patch File Download Diff File

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

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

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

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

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-ics/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

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

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

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

BIN
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store vendored
View File

Binary file not shown.

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

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

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

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

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

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

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

@ -55,4 +55,12 @@ public class MesPpTemplate extends BaseBean {
@ApiParam(value = "工单数量") @ApiParam(value = "工单数量")
@AnnoOutputColumn @AnnoOutputColumn
private Double qty; private Double qty;
@ApiParam(value = "序号")
@AnnoOutputColumn
private Integer seq;
@ApiParam(value = "零件组号")
@AnnoOutputColumn
public String partGroupNo;
} }

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.wms.bean; package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -185,6 +186,15 @@ public class WmsDocMovementDetails extends BaseBean {
private String soOrderNo; private String soOrderNo;
@Transient @Transient
@ApiParam(value = "替代物料编码")
private String subPartNo;
@Transient
@ApiParam(value = "替代物料名称")
private String subPartName;
@Transient
@ApiParam("实际批次") @ApiParam("实际批次")
private String actualLot; private String actualLot;

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

@ -11,7 +11,11 @@ import lombok.ToString;
import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*; import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List; import java.util.List;
/** /**
@ -115,6 +119,10 @@ public class WmsDocMovementMaster extends BaseBean {
@ApiParam(value = "客户单号") @ApiParam(value = "客户单号")
private String custOrderNo; private String custOrderNo;
@Column(name = "REMARK")
@ApiParam("备注")
private String remark;
@Transient @Transient
private List<WmsDocMovementDetails> movementDetailsList; private List<WmsDocMovementDetails> movementDetailsList;

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

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-pojo</artifactId> <artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId> <groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version> <version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
pom.xml
Unescape Escape View File

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

2
sonar-project.properties
Unescape Escape View File

@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
# defaults to project key # defaults to project key
sonar.projectName=i3plus-pojo sonar.projectName=i3plus-pojo
# defaults to 'not provided' # defaults to 'not provided'
sonar.projectVersion=1.0-DEV-SNAPSHOT sonar.projectVersion=1.0-PROD-SNAPSHOT
# Path is relative to the sonar-project.properties file. Defaults to . # Path is relative to the sonar-project.properties file. Defaults to .
#sonar.sources=./ #sonar.sources=./

Write Preview
Loading…
Cancel
Save