系统数据初始化

yun-zuoyi
许心洁 6 years ago
parent 7008d5c35e
commit 79d1da3230

@ -2376,4 +2376,38 @@ public class WmsEnumUtil {
return tmp; return tmp;
} }
} }
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STEP {
ONE_STEP(1, "一步法"), TWO_STEP(2, "两步法");
private int value;
private String description;
STEP(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
} }

@ -3,8 +3,6 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
@ -16,8 +14,6 @@ import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient; import javax.persistence.Transient;
import java.util.List;
import java.util.Map;
/** /**
* @Description : * @Description :
@ -61,7 +57,7 @@ public class WmsOpType extends BaseBean {
@Column(name = "LAST_TRANS_TIME") @Column(name = "LAST_TRANS_TIME")
@ApiParam(value = "末次处理时间") @ApiParam(value = "末次处理时间")
public String lastTransTime; private String lastTransTime;
@Transient @Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ -75,7 +71,7 @@ public class WmsOpType extends BaseBean {
@Column(name = "SPLIT_RULE") @Column(name = "SPLIT_RULE")
@ApiParam(value = "拆分规则") @ApiParam(value = "拆分规则")
public String splitRule; private String splitRule;
@Column(name = "IS_MERGE") @Column(name = "IS_MERGE")
@ApiParam(value = "是否合并单据", example = "0") @ApiParam(value = "是否合并单据", example = "0")
@ -83,7 +79,7 @@ public class WmsOpType extends BaseBean {
@Column(name = "MERGE_RULE") @Column(name = "MERGE_RULE")
@ApiParam(value = "合并规则") @ApiParam(value = "合并规则")
public String mergeRule; private String mergeRule;
@Column(name = "IS_AUTO_CLOSE") @Column(name = "IS_AUTO_CLOSE")
@ApiParam(value = "任务未完是否关闭", example = "0") @ApiParam(value = "任务未完是否关闭", example = "0")

Loading…
Cancel
Save