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/2] =?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/2] =?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; }