From 35690ce13810e259b560cba2fb298c41b5f3d308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 8 May 2019 17:09:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=95=8C=E9=9D=A2+=E5=90=8E=E7=AB=AF=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsActionGroupModel.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 56 ++++++++++++++++++---- 2 files changed, 49 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java index 260eda7..048379c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -18,9 +19,10 @@ import java.util.List; **/ @Data @Api("作业流程Model") -public class WmsActionGroupModel { +public class WmsActionGroupModel implements Serializable { @ApiParam("流程") public WmsActionGroup wmsActionGroup; + @ApiParam("流程明细Model集合") public List wmsActionGroupDetailsModelList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 4830c63..310e5fa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 作业流程 @@ -24,44 +25,60 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_ACTION_GROUP") +@Table(name = "WMS_ACTION_GROUP") @Api("作业流程") public class WmsActionGroup extends BaseBean { - @Column(name="AG_NAME_E") + @Column(name = "AG_NAME_E") @ApiParam("英文流程名称") private String agNameE; - @Column(name="AG_DESC_E") + @Column(name = "AG_DESC_E") @ApiParam("英文流程描述") private String agDescE; - @Column(name="AG_NAME_C") + @Column(name = "AG_NAME_C") @ApiParam("中文流程名称") private String agNameC; - @Column(name="AG_DESC_C") + @Column(name = "AG_DESC_C") @ApiParam("中文流程描述") private String agDescC; - @Column(name="INIT_AM_ID") + @Column(name = "INIT_AM_ID") @ApiParam(value = "初始化组件编号", example = "0") private Long initAmId; - @Column(name="DETAILS_AM_ID") + @Transient + @ApiParam(value = "初始化组件名称") + private String initAmName; + + @Column(name = "DETAILS_AM_ID") @ApiParam(value = "明细处理组件编号", example = "0") private Long detailsAmId; - @Column(name="SUBMIT_AM_ID") + @Transient + @ApiParam(value = "明细处理组件名称") + private String detailsAmName; + + @Column(name = "SUBMIT_AM_ID") @ApiParam(value = "提交组件编号", example = "0") private Long submitAmId; - @Column(name="END_AM_ID") + @Transient + @ApiParam(value = "提交组件名称") + private String submitAmName; + + @Column(name = "END_AM_ID") @ApiParam(value = "结束组件编号", example = "0") private Long endAmId; + @Transient + @ApiParam(value = "结束组件名称") + private String endAmName; + // 1=true, 2 = false - @Column(name="AUTO_INIT") + @Column(name = "AUTO_INIT") @ApiParam(value = "任务自动初始化", example = "0") private Integer autoInit; @@ -88,4 +105,23 @@ public class WmsActionGroup extends BaseBean { return endAmId; } } + + public WmsActionGroup() { + } + + public WmsActionGroup(String agNameE, String agDescE, String agNameC, String agDescC, Integer autoInit, Long initAmId, String initAmName, Long detailsAmId, String detailsAmName, Long submitAmId, String submitAmName, Long endAmId, String endAmName) { + this.agNameE = agNameE; + this.agDescE = agDescE; + this.agNameC = agNameC; + this.agDescC = agDescC; + this.autoInit = autoInit; + this.initAmId = initAmId; + this.initAmName = initAmName; + this.detailsAmId = detailsAmId; + this.detailsAmName = detailsAmName; + this.submitAmId = submitAmId; + this.submitAmName = submitAmName; + this.endAmId = endAmId; + this.endAmName = endAmName; + } } From f343ea865c01b9645cb386b2d2bad159f87efde3 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Wed, 8 May 2019 18:40:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=92=8C=E7=A1=AC?= =?UTF-8?q?=E4=BB=B6=E9=80=82=E9=85=8D=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 17 +++++++++++++++++ .../estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 6 ++++-- modules/i3plus-pojo-lac/pom.xml | 17 +++++++++++++++++ pom.xml | 2 ++ 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-andon/pom.xml create mode 100644 modules/i3plus-pojo-lac/pom.xml diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml new file mode 100644 index 0000000..c31090b --- /dev/null +++ b/modules/i3plus-pojo-andon/pom.xml @@ -0,0 +1,17 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-andon + jar + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 6c19f95..43adf39 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -28,8 +28,10 @@ public class CommonEnumUtil { REPORT(21,"block-report","智能报表"), WORKFLOW(22,"block-workflow","智能工作流"), JOBFLOW(23,"block-jobflow","智能作业流"), - SOFTSWITCH(24,"block-softswitch","智能软件适配器"), - HARDSWITCH(25,"block-hardswitch","智能硬件适配器"), + SOFTSWITCH(24,"block-softswitch","软件适配器"), + HARDSWITCH(25,"block-hardswitch","硬件适配器"), + LAC(26,"link-connect","连接适配器"), + ANDON(27,"andon","安灯"), CENTER(99,"icloud-server","注册中心"), SURFACE(98,"i3surface","对外服务"), CLOUD(97,"i3cloud","微服务"), diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml new file mode 100644 index 0000000..3681eb6 --- /dev/null +++ b/modules/i3plus-pojo-lac/pom.xml @@ -0,0 +1,17 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-lac + jar + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index e5f0bb0..1ce4f37 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,8 @@ modules/i3plus-pojo-workflow modules/i3plus-pojo-mes-pcn modules/i3plus-pojo-sweb + modules/i3plus-pojo-andon + modules/i3plus-pojo-lac