diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java similarity index 72% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java index 11a2cf3..9ef9648 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java @@ -1,5 +1,7 @@ -package cn.estsh.i3plus.pojo.wms.bean; +package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsOptionModel; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -43,19 +45,7 @@ public class WmsActionResponseBean implements Serializable { public String message; @ApiParam("列表信息") - public List informations; - public List getInformations(){ - if(informations == null){ - informations= new ArrayList<>(); - } - return informations; - } - public void setInformation(List list){ - if(list == null){ - list = new ArrayList<>(); - } - informations = list; - } + public List informations; @ApiParam("可选项") public List options; @@ -88,50 +78,42 @@ public class WmsActionResponseBean implements Serializable { */ @ApiParam(value = "是否需要选择单号") public Boolean toSelected = false; - - /** - * 默认为true，如果这个值为true就禁用按钮否则可用， - */ - @ApiParam(value = "按钮是否禁用") - public Boolean isBtnDisabled = true; - - /** - * 默认为true，如果这个值为true就禁用按钮否则可用， - */ - @ApiParam(value = "按钮是否禁用") - public Boolean isDetailsBtnDisabled = true; - /** - * 默认为true，如果这个值为true就禁用按钮否则可用， + * 与 toSelected 属性配合使用， + * 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件 */ - @ApiParam(value = "按钮是否禁用") - public Boolean isCommitBtnDisabled = true; - + @ApiParam(value = "关键字段列名") + public String keyColumn; /** * 默认为true，如果这个值为true就禁用按钮否则可用， */ @ApiParam(value = "输入框是否禁用") public Boolean isInputBtnDisabled = false; - /** - * 与 toSelected 属性配合使用， - * 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件 - */ - @ApiParam(value = "关键字段列名") - public String keyColumn; - - @ApiParam(value = "是否完成流程操作") - public Boolean isComplete = false; - @ApiParam(value = "交易类型信息") public WmsTransType wmsTransType; + @ApiParam(value = "是否自动开窗") + public Boolean isAutoOpenWindow = false; + + @ApiParam(value = "正则校验") + private String regularCheck; + + @ApiParam(value = "正则校验失败提示") + private String regularCheckFailMsg; + + @ApiParam(value = "搜索KEY") + public String searchKey; + + @ApiParam(value = "分组KEY") + public String groupKey; + public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; this.message = message; } - public WmsActionResponseBean(String percent, String message, List informations, Obj details, Boolean codeStatus, Map barCode) { + public WmsActionResponseBean(String percent, String message, List informations, Obj details, Boolean codeStatus, Map barCode) { this.percent = percent; this.message = message; this.informations = informations; @@ -140,7 +122,7 @@ public class WmsActionResponseBean implements Serializable { this.barCode = barCode; } - public WmsActionResponseBean(String percent, String message, List informations, Obj details, Boolean codeStatus) { + public WmsActionResponseBean(String percent, String message, List informations, Obj details, Boolean codeStatus) { this.percent = percent; this.message = message; this.informations = informations; @@ -148,8 +130,7 @@ public class WmsActionResponseBean implements Serializable { this.codeStatus = codeStatus; } - public WmsActionResponseBean(String percent, String message, List informations, Obj details, Boolean codeStatus, Boolean isBtnDisabled) { - this.isBtnDisabled = isBtnDisabled; + public WmsActionResponseBean(String percent, String message, List informations, Obj details, Boolean codeStatus, Boolean isBtnDisabled) { this.percent = percent; this.message = message; this.informations = informations; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java new file mode 100644 index 0000000..edbc48f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 消息样式实体类 + * @Reference + * @Author dragon + * @CreateDate 2019/8/26 10:36 + * @Modify + */ +@Data +public class WmsMessageStyleModel implements Serializable { + private static final long serialVersionUID = -810847996371452831L; + @ApiParam("任务状态") + public Integer taskStatus; + @ApiParam("单据明细状态") + public Integer odStatus; + + @ApiParam("消息") + public String message; + + @ApiParam("前景色") + public String foregroundColor; + @ApiParam("背景色") + public String backgroundColor; + @ApiParam("是否粗体") + public boolean isBold; + @ApiParam("是否斜体") + public boolean isItalics; + @ApiParam("字号") + public Integer fontSize; + + public WmsMessageStyleModel() { + } + + public WmsMessageStyleModel(String message) { + this.message = message; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index e1ede6a..dad2ec7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -53,6 +53,9 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "供应商编号") private String vendorNo; + @ApiParam(value = "样式") + private WmsMessageStyleModel wmsMessageStyleModel; + public WmsTaskInfoModel() { } 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 5062bec..1cdfb49 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 @@ -61,6 +61,14 @@ public class WmsActionGroupDetails extends BaseBean { @ApiParam(value = "长度检查", example = "0") private Integer lenCheck; + @Column(name = "REGULAR_CHECK") + @ApiParam(value = "正则校验") + private String regularCheck; + + @Column(name = "REGULAR_CHECK_FAIL_MSG") + @ApiParam(value = "正则校验失败提示") + private String regularCheckFailMsg; + @Column(name = "AS_ID") @ApiParam(value = "作业步骤", example = "0") @JsonSerialize(using = ToStringSerializer.class) @@ -100,6 +108,16 @@ public class WmsActionGroupDetails extends BaseBean { @ApiParam(value = "是否可提交", example = "2") private Integer isCommitAble; + @Column(name = "IS_AUTO_OPEN_WINDOW") + @ApiParam(value = "是否自动开窗", example = "2") + private Integer isAutoOpenWindow; + + @ApiParam(value = "搜索KEY") + public String searchKey; + + @ApiParam(value = "分组KEY") + public String groupKey; + public int getSeqVal() { return this.seq == null ? 0 : this.seq; } @@ -112,10 +130,6 @@ public class WmsActionGroupDetails extends BaseBean { return this.okSeq == null ? 0 : this.okSeq; } - public int getPreShowVal() { - return this.preShow == null ? 0 : this.preShow; - } - public long getShowAmIdVal() { return this.showAmId == null ? 0 : this.showAmId; } @@ -124,6 +138,10 @@ public class WmsActionGroupDetails extends BaseBean { return this.isCommitAble == null ? 0 : this.isCommitAble; } + public int getIsAutoOpenWindowVal() { + return this.isAutoOpenWindow == null ? 0 : this.isAutoOpenWindow; + } + public int getValueTypeVal() { return this.valueType == null ? 0 : this.valueType; }