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

Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

Browse Source 
 Conflicts:
	modules/i3plus-pojo-andon/pom.xml
	modules/i3plus-pojo-aps/pom.xml
	modules/i3plus-pojo-jobflow/pom.xml
yun-zuoyi
puxiao.liao 4 years ago
parent 7c60ce4cdc 5f52b1aa33
commit eb8f03cf19
22 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape Escape View File

@ -14,3 +14,4 @@ target
*.log *.log
*.properties *.properties
.DS_Store .DS_Store
pom.xml

2
modules/i3plus-pojo-base/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.0.1</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-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.0.1</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-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.0.1</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-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.0.1</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-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.0.1</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-mdm/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.0.1</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-mes-pcn/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.0.1</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-mes/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.0.1</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>

13
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java
Unescape Escape View File

@ -19,6 +19,9 @@ public class ProduceDispPassRateModel {
@ApiParam("统计时间") @ApiParam("统计时间")
private String statisticalTime; private String statisticalTime;
@ApiParam("产品条码")
private String srialNumber;
//统计选项（10=全部，20=冻结，30=报废） //统计选项（10=全部，20=冻结，30=报废）
@ApiParam("统计选项") @ApiParam("统计选项")
private Integer statisticalOption; private Integer statisticalOption;
@ -44,6 +47,16 @@ public class ProduceDispPassRateModel {
this.ratio = ratio; this.ratio = ratio;
} }
public ProduceDispPassRateModel(String statisticalTime, String srialNumber, Integer statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) {
this.statisticalTime = statisticalTime;
this.srialNumber = srialNumber;
this.statisticalOption = statisticalOption;
this.freezeQty = freezeQty;
this.scrapQty = scrapQty;
this.produceSumQty = produceSumQty;
this.ratio = ratio;
}
public ProduceDispPassRateModel() { public ProduceDispPassRateModel() {
} }
} }

2
modules/i3plus-pojo-model/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.0.1</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-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.0.1</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-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.0.1</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-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.0.1</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-screen/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.0.1</version> <version>1.0-TEST-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-softswitch/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.0.1</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-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.0.1</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-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.0.1</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>

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

@ -186,4 +186,8 @@ public class WmsPartExtend extends BaseBean {
public Integer getQcPassCount() { public Integer getQcPassCount() {
return this.qcPassCount == null ? 0 :this.qcPassCount.intValue(); return this.qcPassCount == null ? 0 :this.qcPassCount.intValue();
} }
public Integer getQcSkipCycle() {
return this.qcSkipCycle == null ? 0 :this.qcSkipCycle.intValue();
}
} }

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

@ -34,7 +34,8 @@ import javax.persistence.Table;
@Index(columnList = "BATCH_NO"), @Index(columnList = "BATCH_NO"),
@Index(columnList = "STOCK_SN"), @Index(columnList = "STOCK_SN"),
@Index(columnList = "PART_NO"), @Index(columnList = "PART_NO"),
@Index(columnList = "SERIAL_SN") @Index(columnList = "SERIAL_SN"),
@Index(columnList = "ORGANIZE_CODE")
}) })
@DynamicInsert @DynamicInsert
@DynamicUpdate @DynamicUpdate

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.0.1</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>

3
pom.xml
Unescape Escape View File

@ -15,7 +15,8 @@
<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.0.1</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