Merge remote-tracking branch 'remotes/origin/dev' into test

yun-zuoyi
Silliter 6 years ago
commit dd11ff1e71

@ -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(){

@ -65,6 +65,12 @@ public class WmsActionResponseBean<Obj> {
public Boolean toSelected = false;
/**
* truetrue
*/
@ApiParam(value = "按钮是否禁用")
public Boolean isBtnDisabled = true;
/**
* toSelected 使
* keyColumn
*/
@ -96,4 +102,13 @@ public class WmsActionResponseBean<Obj> {
this.codeStatus = codeStatus;
}
public WmsActionResponseBean(String percent, String message, List<String> 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;
}
}

@ -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(){}

Loading…
Cancel
Save