Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

yun-zuoyi
许心洁 6 years ago
commit 838b7ac311

@ -899,7 +899,8 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TASK_INFO_STATUS {
CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理");
CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理")
, CLOSE(40, "已关闭");
private int value;
private String description;
@ -932,24 +933,27 @@ public class WmsEnumUtil {
}
}
/**
*
*
* 1=10=20=30=40=50=60=70=
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum IS_GENERAL_TASK {
CREATE(10, "CREATE", "创建"),
INIT(20, "INIT", "初始化"),
IS_GENERAL(30, "IS_GENERAL", "已生成"),
NO_GENERAL(40, "NO_GENERAL", "不生成"),
CANCEL(50, "CANCEL", "撤销");
public enum STOCK_SN_STATUS {
CREATE(10, "创建"),
QUALITY_CONTROL(20, "质检中"),
PRE_INSTOCK(30, "待入库"),
INSTOCKED(40, "入库"),
PICKED(50, "配料"),
OUT_STOCK(60, "出库"),
COMMING(80, "在途");
private int value;
private String code;
private String description;
IS_GENERAL_TASK(int value, String code, String description) {
STOCK_SN_STATUS(int value, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -961,10 +965,6 @@ public class WmsEnumUtil {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -975,6 +975,10 @@ public class WmsEnumUtil {
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@ -984,32 +988,25 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
*
* 1=10=20=30=40=50=60=70=
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_STATUS {
CREATE(10, "创建"),
QUALITY_CONTROL(20, "质检中"),
PRE_INSTOCK(30, "待入库"),
INSTOCKED(40, "入库"),
PICKED(50, "配料"),
OUT_STOCK(60, "出库"),
COMMING(80, "在途");
public enum IS_GENERAL_TASK {
CREATE(10, "CREATE", "创建"),
INIT(20, "INIT", "初始化"),
IS_GENERAL(30, "IS_GENERAL", "已生成"),
NO_GENERAL(40, "NO_GENERAL", "不生成"),
CANCEL(50, "CANCEL", "撤销");
private int value;
private String code;
private String description;
STOCK_SN_STATUS(int value, String description) {
IS_GENERAL_TASK(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -1021,6 +1018,10 @@ public class WmsEnumUtil {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -1031,10 +1032,6 @@ public class WmsEnumUtil {
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@ -1044,8 +1041,11 @@ public class WmsEnumUtil {
}
return tmp;
}
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
*
*/
@ -1357,20 +1357,22 @@ public class WmsEnumUtil {
}
/**
*
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_INFO_TYPE {
FEED(10, "进料检验"),
ONLINE(20, "在线检验"),
EMDPRODUCT(30, "成品检验"),
SHIPMENTS(40, "出货检验");
public enum QC_INFO_STATUS {
CREATE(10, "新建"),
FINISH(20, "处理中"),
FAIL(30, "已完成"),
CLOSE(40, "已关闭"),
CANCEL(50, "已取消");
private int value;
private String description;
QC_INFO_TYPE(int value, String description) {
QC_INFO_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -1392,27 +1394,20 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
*
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_INFO_STATUS {
CREATE(10, "新建"),
FINISH(20, "处理中"),
FAIL(30, "已完成"),
CLOSE(40, "已关闭"),
CANCEL(50, "已取消");
public enum QC_ITEM_STATUS {
NORMAL(10, "正常"),
CANCELLATION(20, "已处理");
private int value;
private String description;
QC_INFO_STATUS(int value, String description) {
QC_ITEM_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -1435,19 +1430,20 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
*
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_ITEM_STATUS {
NORMAL(10, "正常"),
CANCELLATION(20, "已处理");
public enum QC_INFO_TYPE {
FEED(10, "进料检验"),
ONLINE(20, "在线检验"),
EMDPRODUCT(30, "成品检验"),
SHIPMENTS(40, "出货检验");
private int value;
private String description;
QC_ITEM_STATUS(int value, String description) {
QC_INFO_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -1469,8 +1465,11 @@ public class WmsEnumUtil {
}
return tmp;
}
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
*
*/

Loading…
Cancel
Save