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

解决冲突

Browse Source
yun-zuoyi
jokelone 6 years ago
parent 9e4930968f
commit 7139d9b5f1
1 changed files with 3 additions and 115 deletions
Show Stats Download Patch File Download Diff File

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

@ -13,7 +13,6 @@ public class MesEnumUtil {
/**
<<<<<<< HEAD
* mes 工位类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -21,25 +20,11 @@ public class MesEnumUtil {
REPEATABLE(1, "可重复"),
NOT_REPEAT(2, "不可重复");
=======
* mes设备作业任务明细-执行状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_DETAIL_ACTION_STATUS {
PENDING(10, "待处理"),
COMPLETE(20, "已完成"),
CANCEL(30, "取消");
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
private int value;
private String description;
<<<<<<< HEAD
MES_IS_REPEAT(int value, String description) {
=======
MES_EQU_TASK_DETAIL_ACTION_STATUS(int value, String description) {
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
this.value = value;
this.description = description;
}
@ -52,7 +37,6 @@ public class MesEnumUtil {
return description;
}
<<<<<<< HEAD
// 根据value返回枚举类型,主要在switch中使用
public static MES_IS_REPEAT getByValue(int value) {
for (MES_IS_REPEAT mesInsertExcel : values()) {
@ -64,8 +48,6 @@ public class MesEnumUtil {
}
=======
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -79,7 +61,6 @@ public class MesEnumUtil {
}
/**
<<<<<<< HEAD
* mes 工位类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -87,24 +68,11 @@ public class MesEnumUtil {
NORMAL(1, "正常"),
REWORK(2, "返修");
=======
* mes设备作业任务明细-整体结果
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_DETAIL_FINAL_RESULT {
YES(10, "合格"),
NO(20, "不合格");
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
private int value;
private String description;
<<<<<<< HEAD
MES_WORK_CELL_TYPE(int value, String description) {
=======
MES_EQU_TASK_DETAIL_FINAL_RESULT(int value, String description) {
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
this.value = value;
this.description = description;
}
@ -117,7 +85,6 @@ public class MesEnumUtil {
return description;
}
<<<<<<< HEAD
// 根据value返回枚举类型,主要在switch中使用
public static MES_WORK_CELL_TYPE getByValue(int value) {
for (MES_WORK_CELL_TYPE mesInsertExcel : values()) {
@ -129,8 +96,6 @@ public class MesEnumUtil {
}
=======
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -144,7 +109,6 @@ public class MesEnumUtil {
}
/**
<<<<<<< HEAD
* pcn 动作类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -152,24 +116,11 @@ public class MesEnumUtil {
BIND(1, "绑定"),
UNTYING(2, "解绑");
=======
* mes设备作业任务明细-维修标识
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_DETAIL_REPAIR_FLAG {
FALSE(10, "否"),
TRUE(20, "是");
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
private int value;
private String description;
<<<<<<< HEAD
MES_ACTION_TYPE(int value, String description) {
=======
MES_EQU_TASK_DETAIL_REPAIR_FLAG(int value, String description) {
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
this.value = value;
this.description = description;
}
@ -182,7 +133,6 @@ public class MesEnumUtil {
return description;
}
<<<<<<< HEAD
// 根据value返回枚举类型,主要在switch中使用
public static MES_ACTION_TYPE getByValue(int value) {
for (MES_ACTION_TYPE mesInsertExcel : values()) {
@ -194,8 +144,6 @@ public class MesEnumUtil {
}
=======
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -209,7 +157,6 @@ public class MesEnumUtil {
}
/**
<<<<<<< HEAD
* pcn 是否是关键件
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -217,27 +164,11 @@ public class MesEnumUtil {
IS_KEY(1, "是"),
NO_KEY(2, "否");
=======
* mes设备作业状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_STATUS {
CREATE(10, "创建"),
LANDED(20, "下达"),
OPEN(30, "开启"),
CLOSE(40, "关闭"),
CANCEL(50, "取消");
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
private int value;
private String description;
<<<<<<< HEAD
MES_IS_KEY(int value, String description) {
=======
MES_EQU_TASK_STATUS(int value, String description) {
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
this.value = value;
this.description = description;
}
@ -250,7 +181,6 @@ public class MesEnumUtil {
return description;
}
<<<<<<< HEAD
// 根据value返回枚举类型,主要在switch中使用
public static MES_IS_KEY getByValue(int value) {
for (MES_IS_KEY mesInsertExcel : values()) {
@ -262,8 +192,6 @@ public class MesEnumUtil {
}
=======
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -277,7 +205,6 @@ public class MesEnumUtil {
}
/**
<<<<<<< HEAD
* mes 维修状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -285,25 +212,11 @@ public class MesEnumUtil {
REPAIRED(1, "已维修"),
NO_REPAIR(2, "待维修");
=======
* mes设备作业任务来源
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_SOURCE {
PLAN(10, "周期计划"),
CREATE(20, "手工创建"),
ANDON(30, "ANDON");
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
private int value;
private String description;
<<<<<<< HEAD
MES_REPAIR_STATUS(int value, String description) {
=======
MES_EQU_TASK_SOURCE(int value, String description) {
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
this.value = value;
this.description = description;
}
@ -316,7 +229,6 @@ public class MesEnumUtil {
return description;
}
<<<<<<< HEAD
// 根据value返回枚举类型,主要在switch中使用
public static MES_REPAIR_STATUS getByValue(int value) {
for (MES_REPAIR_STATUS mesInsertExcel : values()) {
@ -328,8 +240,6 @@ public class MesEnumUtil {
}
=======
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -343,7 +253,6 @@ public class MesEnumUtil {
}
/**
<<<<<<< HEAD
* mes 操作类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -354,24 +263,11 @@ public class MesEnumUtil {
MATERIAL_DISMANTLING(3, "物料拆解"),
REWORK(4, "返修作业"),
WORKSTATION_MONITORING(5, "工位监控");
=======
* mes设备作业通知标识
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_NOTIFY_FLAG {
FALSE(10, "未通知"),
TRUE(20, "已通知");
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
private int value;
private String description;
<<<<<<< HEAD
MES_OPERATE_TYPE(int value, String description) {
=======
MES_EQU_TASK_NOTIFY_FLAG(int value, String description) {
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
this.value = value;
this.description = description;
}
@ -384,7 +280,6 @@ public class MesEnumUtil {
return description;
}
<<<<<<< HEAD
// 根据value返回枚举类型,主要在switch中使用
public static MES_OPERATE_TYPE getByValue(int value) {
for (MES_OPERATE_TYPE mesInsertExcel : values()) {
@ -396,8 +291,6 @@ public class MesEnumUtil {
}
=======
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -411,11 +304,7 @@ public class MesEnumUtil {
}
/**
<<<<<<< HEAD
* mes设备作业要求-作业类型
=======
* mes导入模块
>>>>>>> 8808a77de69870f6ae783f4adba3d19d8f54c553
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_INSERT_EXCEL {
@ -464,10 +353,10 @@ public class MesEnumUtil {
}
/**
* mes设备-作业类型
* mes设备作业要求-作业类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_TYPE {
public enum MES_EQU_TASK_STANDARD_TASK_TYPE {
CHECK(10, "点检"),
MAINTAIN(20, "保养"),
@ -476,7 +365,7 @@ public class MesEnumUtil {
private int value;
private String description;
MES_EQU_TASK_TYPE(int value, String description) {
MES_EQU_TASK_STANDARD_TASK_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -1646,7 +1535,6 @@ public class MesEnumUtil {
CUSTOM_COMPONENT("customComponent", "定制内容"),
TASK_COMPLETE("taskComplete", "整个扫描完成"),
STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
RUNNING_INFO("runningInfo", "运行信息"),
RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");

Write Preview
Loading…
Cancel
Save