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

Merge remote-tracking branch 'remotes/origin/dev' into test

Browse Source
yun-zuoyi
simon.song 5 years ago
parent d8d2dea922 0deb9b4733
commit 3917408421
40 changed files with 60 additions and 44 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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-base-mongo/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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-TEST-SNAPSHOT</version> <version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

1
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java
Unescape Escape View File

@ -67,6 +67,7 @@ public class MesDefect extends BaseBean implements Serializable {
@Transient @Transient
@ApiParam("缺陷类型子集") @ApiParam("缺陷类型子集")
private List<MesDefect> mesDefectList; private List<MesDefect> mesDefectList;
public MesDefect() { public MesDefect() {
} }

1
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java
Unescape Escape View File

@ -35,6 +35,7 @@ public class DefectModel {
@ApiParam("缺陷类型子集") @ApiParam("缺陷类型子集")
private List<DefectModel> mesDefectList; private List<DefectModel> mesDefectList;
public DefectModel() { public DefectModel() {
} }

1
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java
Unescape Escape View File

@ -48,6 +48,7 @@ public class MesProdBindRecordModel {
private String serialNumber; private String serialNumber;
@ApiParam("关联批次") @ApiParam("关联批次")
private String lotNo; private String lotNo;
public MesProdBindRecordModel() { public MesProdBindRecordModel() {
} }

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

@ -67,6 +67,7 @@ public class QueueOrderModel implements Serializable {
this.snStatus = snStatus; this.snStatus = snStatus;
this.workType = workType; this.workType = workType;
} }
public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String partNo, String partNameRdd, String workType) { String partNo, String partNameRdd, String workType) {
this.id = id; this.id = id;

8
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java
Unescape Escape View File

@ -113,9 +113,13 @@ public class RequestModel {
return orderNoList; return orderNoList;
} }
public void setActionRequestBean(ActionRequestBean actionRequestBean) { this.actionRequestBean = actionRequestBean; } public void setActionRequestBean(ActionRequestBean actionRequestBean) {
this.actionRequestBean = actionRequestBean;
}
public ActionRequestBean getActionRequestBean() { return actionRequestBean; } public ActionRequestBean getActionRequestBean() {
return actionRequestBean;
}
public Double getCurrentSeq() { public Double getCurrentSeq() {
return currentSeq == null ? 0.0d : currentSeq; return currentSeq == null ? 0.0d : currentSeq;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -286,6 +286,7 @@ public class MesHqlPack {
/** /**
* 按条件分页查询产品条码补打印数据 * 按条件分页查询产品条码补打印数据
*
* @param mesProduceSn * @param mesProduceSn
* @return * @return
*/ */
@ -325,6 +326,7 @@ public class MesHqlPack {
/** /**
* 按条件分页查询包装条码补打印数据 * 按条件分页查询包装条码补打印数据
*
* @param mesPackage * @param mesPackage
* @return * @return
*/ */
@ -387,9 +389,9 @@ public class MesHqlPack {
} }
/** /**
* 按条件分页查询类型信息数据 * 按条件分页查询类型信息数据
*
* @param typeCfg * @param typeCfg
* @return * @return
*/ */

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-TEST-SNAPSHOT</version> <version>1.0-DEV-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/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java
Unescape Escape View File

@ -70,6 +70,10 @@ public class MesRawPartSn extends BaseBean implements Serializable {
@ApiParam("供应商代码") @ApiParam("供应商代码")
private String supplierCode; private String supplierCode;
@Column(name = "CT_NO")
@ApiParam("容器编号")
private String ctNo;
public double getRawQtyVal() { public double getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty; return this.rawQty == null ? 0l : this.rawQty;
} }

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java
Unescape Escape View File

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail; import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail;
import org.springframework.stereotype.Repository;
/** /**
@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail;
* @CreateDate: 2019/10/19 10:33 上午 * @CreateDate: 2019/10/19 10:33 上午
* @Description: * @Description:
**/ **/
@Repository
public interface MesPackageDetailRepository extends BaseRepository<MesPackageDetail, Long> { public interface MesPackageDetailRepository extends BaseRepository<MesPackageDetail, Long> {
} }

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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-TEST-SNAPSHOT</version> <version>1.0-DEV-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-TEST-SNAPSHOT sonar.projectVersion=1.0-DEV-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