From e72c2dd09a604860e42188dee6fb52c9d80180e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 11 Jan 2021 14:14:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2586?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java index 4a59bba..47731d5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java @@ -26,4 +26,6 @@ public class WmsAgCacheModel implements Serializable { public List options; @ApiParam("作业流程明细Model集合") public Map wmsAgdCacheModelMap; + @ApiParam("流程级别组件参数集合") + public Map> wmsAgAmParamsMap; } 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 f4f5bd8..2ccb28b 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 @@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.List; /** * @Description : 作业流程 @@ -98,6 +99,9 @@ public class WmsActionGroup extends BaseBean { @Transient @ApiParam(value = "提交步骤序号") private Integer submitStepSeq; + @Transient + @ApiParam(value = "流程级别组件参数") + private List agAmParamsList; public long getInitAmIdVal() { return this.initAmId == null ? 0 : this.initAmId.longValue();