作业流程界面+后端分页查询接口

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<WmsActionGroupDetailsModel> wmsActionGroupDetailsModelList;
 }

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