From b7542f8db0dcac7ff4b75d9950d60d24987c1172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 4 Sep 2020 18:13:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=88=AA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java index edaab1e..a6f9b22 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java @@ -42,13 +42,13 @@ public class AndonCellAlarmCause extends BaseBean implements Serializable { @ApiParam(value = "工位代码") private String workCellCode; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class, refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class, refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型") + @ApiParam(value = "安灯类型代码") private String alarmCode; @Column(name = "AC_CODE") - @ApiParam(value = "事件描述") + @ApiParam(value = "事件描述代码") private String acCode; @AnnoOutputColumn(hidden = true) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java index abf5ff9..14e008f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java @@ -42,13 +42,13 @@ public class AndonCellEventCause extends BaseBean implements Serializable { @ApiParam(value = "工位代码") private String workCellCode; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型") + @ApiParam(value = "安灯类型代码") private String alarmCode; @Column(name = "EC_CODE") - @ApiParam(value = "事件原因") + @ApiParam(value = "事件原因代码") private String ecCode; @Transient diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java index 23c8d1b..6fef604 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java @@ -42,13 +42,13 @@ public class AndonCellEventMethod extends BaseBean implements Serializable { @ApiParam(value = "工位代码") private String workCellCode; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型") + @ApiParam(value = "安灯类型代码") private String alarmCode; @Column(name = "EM_CODE") - @ApiParam(value = "处理方法") + @ApiParam(value = "处理方法代码") private String emCode; @Transient From 396dcdf56c02d49dd3a50b5d7c5ef56a97cfc51a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 5 Sep 2020 10:47:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B6=82=E8=A3=85=20=E4=B8=80=E7=AE=B1=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java index 57d30f8..23f46a5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -101,4 +101,8 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @Transient @ApiParam("状态执行情况") private StepResult stepResult; + + @Transient + @ApiParam("是否执行下个扫描信息") + private boolean execNextScan = false; } From 01eda59dd5e194d1b40e4e17cc6f74bf100cb360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 5 Sep 2020 11:28:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=9011069=2019048-=20=E6=8A=9B?= =?UTF-8?q?=E5=85=89=E8=B4=A8=E9=87=8F=E5=BE=85=E5=AE=9A=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=90=8E=EF=BC=8C=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=B8=8D=E6=98=8E=E7=A1=AE=EF=BC=81-2020-09-05?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index f74c24f..952b144 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -4433,6 +4433,16 @@ public class MesPcnEnumUtil { public static String valueOfDescription(int val) { return valueOf(val); } + + public static String codeOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } } /** From 01fc8bb0622f4cff137921b0a35727641121bcd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 5 Sep 2020 12:40:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E6=9D=A1=E7=A0=81=E5=B1=A5?= =?UTF-8?q?=E5=8E=86=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 8fe5ea9..0f176b5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -137,6 +137,10 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("操作类型") private Integer operateType; + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; + @Transient @ApiParam("返回信息") private String resultMsg;