diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index b603804..ae9cd66 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3829,7 +3829,8 @@ public class MesEnumUtil { QUALIFIED(10, "number", "数字"), DEFECTED(20, "text", "字符串"), SCRAPED(30, "select", "可选值"), - BUTTON(40, "button", "按钮"); + BUTTON(40, "button", "按钮"), + WINDOW(50, "window", "开窗"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index 237df3e..dd0d6b0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java @@ -11,7 +11,10 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; +import java.util.Map; /** * @Description :工步参数 @@ -49,4 +52,32 @@ public class MesStepParam extends BaseBean implements Serializable { @Column(name = "PARAM_ATTRIBUTE") @ApiParam("参数属性 text select") private String paramAttribute; + + @Column(name = "EXHIBITION_KEY") + @ApiParam("展示key") + private String exhibitionKey; + + @Column(name = "EXHIBITION_VALUE") + @ApiParam("展示value") + private String exhibitionValue; + + @Column(name = "OBJECT_CODE") + @ApiParam("参数对象") + private String objectCode; + + @Column(name = "TYPE") + @ApiParam("type") + private Integer type = 0; + + @Transient + @ApiParam("可选值的数据") + private List> enumList; + + @Transient + @ApiParam("key的值") + private Object geValue; + + @Transient + @ApiParam("value的值") + private Object geDescription; }