diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 9987e99..d65c807 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -107,7 +107,7 @@ public abstract class BaseBean implements Serializable { @Transient @ApiParam(value = "排序类型,1 正序,2 倒序",example = "1") //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc - public int ascOrDesc = 1; + public Integer ascOrDesc = 1; //排序方式 public String orderBy(){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index b65a081..d87e915 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -65,6 +65,12 @@ public class WmsActionResponseBean { public Boolean toSelected = false; /** + * 默认为true,如果这个值为true就禁用按钮否则可用, + */ + @ApiParam(value = "按钮是否禁用") + public Boolean isBtnDisabled = true; + + /** * 与 toSelected 属性配合使用, * 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件 */ @@ -96,4 +102,13 @@ public class WmsActionResponseBean { this.codeStatus = codeStatus; } + public WmsActionResponseBean(String percent, String message, List informations, Obj details, Boolean codeStatus, Boolean isBtnDisabled) { + this.isBtnDisabled = isBtnDisabled; + this.percent = percent; + this.message = message; + this.informations = informations; + this.details = details; + this.codeStatus = codeStatus; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 4ccbc47..f45ae03 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -107,13 +107,13 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("关联单号") public String refSrc; - @ApiParam("待出库数量") + @ApiParam(value = "待出库数量", example = "0") @Transient - private long waitingCounts; + private Long waitingCounts; - @ApiParam("已出库数量") + @ApiParam(value = "已出库数量", example = "0") @Transient - private long finishedCounts; + private Long finishedCounts; public WmsMoveDetails(){}