I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
yun-zuoyi
crish 6 years ago
parent a30f4aae83 3eeaff50b3
commit 835ea47ba2
3 changed files with 151 additions and 65 deletions
Show Stats Download Patch File Download Diff File

1
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

@ -26,7 +26,6 @@ public class MesEnumUtil {
MES_PCN_SYNC_CFG("MesPcnSyncCfg", "MES_PCN_SYNC_CFG", "同步配置"),
MES_BUTTON_STATUS("MesButtonStatus", "MES_BUTTON_STATUS", "按钮状态配置表"),
MES_WORK_CELL_PARAM("MesWorkCellParam", "MES_WORK_CELL_PARAM", "工作单元参数"),
MES_STATUS_CFG("MesStatusCfg", "MES_STATUS_CFG", "状态配置"),
MES_EVENT("MesEvent", "MES_EVENT", "事件清单"),
MES_METHOD("MesMethod", "MES_METHOD", "方法清单"),
MES_ACTION("MesAction", "MES_ACTION", "动作"),

87
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

@ -13,6 +13,93 @@ import org.apache.commons.lang3.StringUtils;
public class MesPcnEnumUtil {
/**
* 条码类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PRODUCE_SN_TYPE {
NORMAL(10, "正常件"),
FIRST_INSPECTION(20, "首检件");
private int value;
private String description;
MES_PRODUCE_SN_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* pcn 操作类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_OPERATE_TYPE {
WORKSTATION_SCAN(10, "工位扫描"),
QUALITY_JUDGEMENT(20, "质量判定"),
MATERIAL_DISMANTLING(30, "物料拆解"),
REWORK(40, "返修作业"),
WORKSTATION_MONITORING(50, "工位监控");
private int value;
private String description;
MES_OPERATE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_OPERATE_TYPE getByValue(int value) {
for (MES_OPERATE_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
return mesInsertExcel;
}
}
return null;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesProductEncodeCfg 匹配类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

128
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -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);
}
}
/**
* 作业记录参数状态
*/
@ -3748,7 +3747,8 @@ public class WmsEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SN_OPERATE_TYPE {
REPORT(10, "REPORT", "生产报工"),
BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错");
BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错"),
REPORT_CANCEL(30, "REPORT_CANCEL", "报工撤销");
private int value;
private String code;

Write Preview
Loading…
Cancel
Save