diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index d2088c2..ac084cf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -2036,13 +2036,13 @@ public class WmsEnumUtil { * 单据是否指定条码 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ORDER_IS_SN { + public enum IS_CHECK_SN { IS_APPOINT_SN(1, "指定条码"), APPOINT_SN(2, "不指定条码"); private int value; private String description; - ORDER_IS_SN(int value, String description) { + IS_CHECK_SN(int value, String description) { this.value = value; this.description = description; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java index d72ec65..375466a 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java @@ -34,9 +34,9 @@ public class BfIntercept extends BaseBean { @ApiParam(value ="拦截器名称") private String interceptName; + // BlockFormEnumUtil.EXECUTION_TYPE @Column(name="EXECUTE_MODE") @ApiParam(value ="执行方式") - @JsonSerialize(using = ToStringSerializer.class) private Integer executeMode; @Column(name="EXECUTE_CONTENT") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java index 859a7e4..0f63450 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java @@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : 表单菜单目录 @@ -76,4 +78,8 @@ public class BfMenu extends BaseBean { @Column(name = "MENU_STATUS") @ApiParam(value = "菜单状态") private Integer menuStatus; + + @Transient + @ApiParam(value = "菜单状态") + private List bfMenuList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java new file mode 100644 index 0000000..b9ea7ae --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.model.form; + +import cn.estsh.i3plus.pojo.form.bean.BfLayout; +import cn.estsh.i3plus.pojo.form.bean.BfMethod; +import cn.estsh.i3plus.pojo.form.bean.BfMethodDetail; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 表单模型 + * + * 表单功能
+ * 布局 功能明细
+ * 自定义按钮
+ * 元素
+ * 元素按钮
+ *
+ * @Reference : + * @Author : Adair Peng + * @CreateDate : 2019-04-17 10:35 + * @Modify: + **/ +@Data +public class FormModel { + + // 表单功能 + @ApiParam(value = "表单功能") + private BfMethod method; + + // 布局 + @ApiParam(value = "功能布局") + private BfLayout layout; + + // 功能明细 + @ApiParam(value = "功能明细") + private List methodDetailList; + + // 元素 + @ApiParam(value = "元素Model") + private List elementModelList; +}