Merge branch 'dev' into test

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java

@@ -35,8 +35,11 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam("进度")
     public String percent = "消息提示：";
 
-    @ApiParam("当前步骤")
+    @ApiParam("当前步骤类型名称")
-    public Integer currentStep;
+    public String currentStepTypeName;
+
+    @ApiParam("当前步骤名称")
+    public String currentStepName;
 
     @ApiParam("总步数")
     public int totalStep;

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;
+    }
 }