From 44696061eeabd78ff330cdc008aede293428cdf7 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 30 Mar 2020 13:48:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=BA=E6=9C=80=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 3 +- modules/i3plus-pojo-aps/pom.xml | 3 +- modules/i3plus-pojo-base/pom.xml | 4 +- modules/i3plus-pojo-form/pom.xml | 3 +- modules/i3plus-pojo-hardswitch/pom.xml | 4 +- modules/i3plus-pojo-jobflow/pom.xml | 4 +- modules/i3plus-pojo-lac/pom.xml | 3 +- modules/i3plus-pojo-mes-pcn/pom.xml | 3 +- modules/i3plus-pojo-mes/pom.xml | 3 +- .../i3plus/pojo/mes/bean/MesActionModuleGroup.java | 42 ++++++++++++ .../i3plus/pojo/mes/bean/MesProdRouteOptParam.java | 16 +++++ .../i3plus/pojo/mes/bean/MesRouteProcess.java | 4 ++ .../i3plus/pojo/mes/bean/MesSmRouteOptParam.java | 62 ++++++++++++++++++ .../i3plus/pojo/mes/bean/MesStateMachine.java | 48 ++++++++++++++ .../pojo/mes/bean/MesStateMachineStatus.java | 75 ++++++++++++++++++++++ modules/i3plus-pojo-model/pom.xml | 3 +- modules/i3plus-pojo-platform/pom.xml | 3 +- modules/i3plus-pojo-ptl/pom.xml | 3 +- modules/i3plus-pojo-report/pom.xml | 3 +- modules/i3plus-pojo-softswitch/pom.xml | 3 +- modules/i3plus-pojo-sweb/pom.xml | 3 +- modules/i3plus-pojo-wms/pom.xml | 3 +- modules/i3plus-pojo-workflow/pom.xml | 5 +- pom.xml | 34 +++++++++- 24 files changed, 318 insertions(+), 19 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 87a1750..a7393ab 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-andon jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 5ad51a1..83da951 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-aps jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e74f5ed..c39aa75 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index aa8f7a2..85be1d1 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-form jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 7e87d1a..b7d7acb 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,13 +5,15 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-hardswitch jar + 1.0-${profileActive}-SNAPSHOT + dev diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 062455e..bee2e15 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,13 +5,15 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-jobflow jar + 1.0-${profileActive}-SNAPSHOT + dev diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index a6258be..598dbbc 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-lac jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e958e79..93bbef1 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index d5ed765..988d513 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java new file mode 100644 index 0000000..314f526 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/3/30 11:28 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ACTION_MODULE_GROUP") +@Api("工步集") +public class MesActionModuleGroup extends BaseBean implements Serializable { + private static final long serialVersionUID = 1876053661752102998L; + + @Column(name = "AMG_ID") + @ApiParam("组件集编号") + private Long amgId; + + @Column(name = "AM_CODE") + @ApiParam("组件集代码") + private String amCode; + + @Column(name = "SEQ") + @ApiParam("执行顺序") + private Integer seq; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java index 074dea2..c0d1436 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java @@ -42,6 +42,18 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable { @ApiParam("工序代码") private String processCode; + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "AMG_ID") + @ApiParam("工步集代码") + private Long amgId; + @Column(name = "STEP_CODE") @ApiParam("工步代码") private String stepCode; @@ -62,6 +74,10 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable { @ApiParam("工步参数值") private String paramValue; + @Column(name = "IS_ACTIVE") + @ApiParam("是否执行 1=是 2=否") + private Integer isActive; + @Transient @Column(name = "PARAM_ATTRIBUTE") @ApiParam("参数属性") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java index fa6d9dd..70d3b44 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java @@ -54,6 +54,10 @@ public class MesRouteProcess extends BaseBean implements Serializable { @ApiParam("是否必须") private Integer isNecessary; + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + public int getSeqVal() { return this.seq == null ? 0 : this.seq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java new file mode 100644 index 0000000..521d413 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/3/30 11:48 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SM_ROUTE_OPT_PARAM") +@Api("产品流程状态机配置操作参数表") +public class MesSmRouteOptParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -5466013923105175070L; + + @Column(name = "PROD_ROUTE_CFG_ID") + @ApiParam("产品流程Id") + private Integer prodRouteCfgId; + + @Column(name="ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name="PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name="STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name="STEP_SEQ") + @ApiParam("工步顺序") + private Integer stepSeq; + + @Column(name="PARAM_TYPE") + private Integer paramType; + + @Column(name="PARAM_CODE") + private String paramCode; + + @Column(name="PARAM_VALUE") + private String paramValue; + + @Column(name="IS_ACTION") + private Integer isAction; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java new file mode 100644 index 0000000..1672c91 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/3/30 11:12 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STATE_MACHINE") +@Api("MES状态机") +public class MesStateMachine extends BaseBean implements Serializable { + private static final long serialVersionUID = 6093522587973076640L; + + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + + @Column(name = "SM_NAME") + @ApiParam("状态机名称") + private String smName; + + @Column(name = "SM_TYPE") + @ApiParam("状态机类型") + private String smType; + + @Lob + @Column(name = "POSITION") + @ApiParam("GOJS的位置") + private String position; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java new file mode 100644 index 0000000..90bcbf9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/3/30 11:12 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STATE_MACHINE_STATUS") +@Api("MES状态机步骤") +public class MesStateMachineStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = 6093522587973076640L; + + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "NEXT_STATUS") + @ApiParam("下一状态") + private String nextStatus; + + @Column(name = "STATUS_NAME") + @ApiParam("状态名称") + private String statusName; + + @Column(name = "TRIGGER_TYPE") + @ApiParam("触发类型 10=内部触发 20=外部触发") + private Integer triggerType; + + @Column(name = "TRIGGER_EVENT") + @ApiParam("触发事件") + private String triggerEvent; + + @Column(name = "TRIGGER_WHERE") + @ApiParam("触发条件") + private String triggerWhere; + + @Column(name = "ACTION_AMG_ID") + @ApiParam("触发调用") + private Integer actionAmgId; + + @Column(name = "IN_AMG_ID") + @ApiParam("进入调用") + private Integer inAmgId; + + @Column(name = "OUT_AMG_ID") + @ApiParam("离开调用") + private Integer outAmgId; + + @Column(name = "STATUS_TYPE", columnDefinition = "tinyint default 0") + @ApiParam("状态类型 10=初始化状态") + private Integer statusType; +} diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 1c2fd71..da26f90 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 12f9ad0..ecb3a42 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-platform jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 27e1b60..ea09b06 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ptl jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 91d3fdd..52a69ad 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-report jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 756086b..a6b12c3 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 770ace5..f3452f8 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-sweb jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index c4dbbbe..9b39050 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-wms jar + 1.0-${profileActive}-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 6f974d5..2e098d8 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,13 +5,16 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-workflow jar + 1.0-${profileActive}-SNAPSHOT + + dev diff --git a/pom.xml b/pom.xml index 37371d2..8b348a9 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform @@ -221,5 +221,37 @@ + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${profileActive}-${project.version} + \ No newline at end of file