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

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

Browse Source
yun-zuoyi
wynne1005 5 years ago
parent 703a3f2195 8a8c3ee34d
commit 2bb32bb6fc
20 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File

4
modules/i3plus-pojo-andon/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-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>
<artifactId>i3plus-pojo-andon</artifactId> <artifactId>i3plus-pojo-andon</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>

4
modules/i3plus-pojo-aps/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-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>
<artifactId>i3plus-pojo-aps</artifactId> <artifactId>i3plus-pojo-aps</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>

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-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>
<artifactId>i3plus-pojo-base</artifactId> <artifactId>i3plus-pojo-base</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>

4
modules/i3plus-pojo-form/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-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>
<artifactId>i3plus-pojo-form</artifactId> <artifactId>i3plus-pojo-form</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<dependencies> <dependencies>

4
modules/i3plus-pojo-hardswitch/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-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>
<artifactId>i3plus-pojo-hardswitch</artifactId> <artifactId>i3plus-pojo-hardswitch</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<profiles> <profiles>
<profile> <profile>

4
modules/i3plus-pojo-jobflow/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-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>
<artifactId>i3plus-pojo-jobflow</artifactId> <artifactId>i3plus-pojo-jobflow</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<profiles> <profiles>
<profile> <profile>

4
modules/i3plus-pojo-lac/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-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>
<artifactId>i3plus-pojo-lac</artifactId> <artifactId>i3plus-pojo-lac</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>

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-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>
<artifactId>i3plus-pojo-mes-pcn</artifactId> <artifactId>i3plus-pojo-mes-pcn</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-${profileActive}-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-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>
<artifactId>i3plus-pojo-mes</artifactId> <artifactId>i3plus-pojo-mes</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
Unescape Escape View File

@ -71,6 +71,8 @@ public class QueueOrderModel implements Serializable {
@ApiParam("队列编号") @ApiParam("队列编号")
private String orderNo; private String orderNo;
@ApiParam("料架是否已打印")
private Integer isGroupPrinted;
public QueueOrderModel() { public QueueOrderModel() {
} }
@ -155,13 +157,14 @@ public class QueueOrderModel implements Serializable {
this.orderNo = orderNo; this.orderNo = orderNo;
} }
public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) { public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted) {
this.id = id; this.id = id;
this.queDetailSeq = queDetailSeq; this.queDetailSeq = queDetailSeq;
this.pgCode = pgCode; this.pgCode = pgCode;
this.queueGroupNo = queueGroupNo; this.queueGroupNo = queueGroupNo;
this.groupNo = groupNo; this.groupNo = groupNo;
this.prodCfgCode = prodCfgCode; this.prodCfgCode = prodCfgCode;
this.isGroupPrinted = isGroupPrinted;
} }
public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,

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-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>
<artifactId>i3plus-pojo-model</artifactId> <artifactId>i3plus-pojo-model</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>

4
modules/i3plus-pojo-platform/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-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>
<artifactId>i3plus-pojo-platform</artifactId> <artifactId>i3plus-pojo-platform</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>

4
modules/i3plus-pojo-ptl/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-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>
<artifactId>i3plus-pojo-ptl</artifactId> <artifactId>i3plus-pojo-ptl</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>

4
modules/i3plus-pojo-report/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-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>
<artifactId>i3plus-pojo-report</artifactId> <artifactId>i3plus-pojo-report</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<dependencies> <dependencies>

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-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>
<artifactId>i3plus-pojo-softswitch</artifactId> <artifactId>i3plus-pojo-softswitch</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<dependencies> <dependencies>

4
modules/i3plus-pojo-sweb/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-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>
<artifactId>i3plus-pojo-sweb</artifactId> <artifactId>i3plus-pojo-sweb</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>

4
modules/i3plus-pojo-wms/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-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>
<artifactId>i3plus-pojo-wms</artifactId> <artifactId>i3plus-pojo-wms</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>

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

@ -44,7 +44,7 @@ public class WmsTransportRule extends BaseBean {
@Column(name = "BUSI_SCENE_TYPE") @Column(name = "BUSI_SCENE_TYPE")
@ApiParam("业务场景") @ApiParam("业务场景")
//@AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") @AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE")
public Integer busiSceneType; public Integer busiSceneType;

4
modules/i3plus-pojo-workflow/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-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>
<artifactId>i3plus-pojo-workflow</artifactId> <artifactId>i3plus-pojo-workflow</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version> <version>1.0-TEST-SNAPSHOT</version>
<profiles> <profiles>
<profile> <profile>

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-${profileActive}-SNAPSHOT</version> <version>1.0-TEST-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>

Write Preview
Loading…
Cancel
Save