From 8f7d3b371bdc36d9f494c9f84d17bb1f2204e92a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 26 Sep 2019 18:42:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6=EF=BC=9A?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E7=BB=99=E5=89=8D=E7=AB=AF=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsActionResponseBean.java | 7 ++-- .../pojo/wms/bean/WmsActionGroupDetails.java | 40 ++++++++++++++++++++-- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java index 40edbf5..a5a4d10 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java @@ -35,8 +35,11 @@ public class WmsActionResponseBean implements Serializable { @ApiParam("进度") public String percent = "消息提示："; - @ApiParam("当前步骤") - public Integer currentStep; + @ApiParam("当前步骤类型名称") + public String currentStepTypeName; + + @ApiParam("当前步骤名称") + public String currentStepName; @ApiParam("总步数") public int totalStep; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 1cdfb49..e8455c4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -84,6 +84,10 @@ public class WmsActionGroupDetails extends BaseBean { private String asName; @Transient + @ApiParam(value = "步骤类型名称") + private String atName; + + @Transient @ApiParam(value = "流程名称") private String agName; @@ -112,11 +116,13 @@ public class WmsActionGroupDetails extends BaseBean { @ApiParam(value = "是否自动开窗", example = "2") private Integer isAutoOpenWindow; + @Column(name = "SEARCH_KEY") @ApiParam(value = "搜索KEY") - public String searchKey; + private String searchKey; + @Column(name = "GROUP_KEY") @ApiParam(value = "分组KEY") - public String groupKey; + private String groupKey; public int getSeqVal() { return this.seq == null ? 0 : this.seq; @@ -153,4 +159,34 @@ public class WmsActionGroupDetails extends BaseBean { public int getLenCheckVal() { return this.lenCheck == null ? 0 : this.lenCheck; } + + public WmsActionGroupDetails() { + } + + public WmsActionGroupDetails(Long agId, Integer seq, Integer okSeq, Integer ngSeq, Integer valueType, Integer toUpper, + Integer lenCheck, String regularCheck, String regularCheckFailMsg, Long asId, Long atId, + String asName, String atName, String goToBtnCode, String goToBtnName, Integer preShow, + Long showAmId, Integer isCommitAble, Integer isAutoOpenWindow, String searchKey, String groupKey) { + this.agId = agId; + this.seq = seq; + this.okSeq = okSeq; + this.ngSeq = ngSeq; + this.valueType = valueType; + this.toUpper = toUpper; + this.lenCheck = lenCheck; + this.regularCheck = regularCheck; + this.regularCheckFailMsg = regularCheckFailMsg; + this.asId = asId; + this.atId = atId; + this.asName = asName; + this.atName = atName; + this.goToBtnCode = goToBtnCode; + this.goToBtnName = goToBtnName; + this.preShow = preShow; + this.showAmId = showAmId; + this.isCommitAble = isCommitAble; + this.isAutoOpenWindow = isAutoOpenWindow; + this.searchKey = searchKey; + this.groupKey = groupKey; + } }