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

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)

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

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

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;
+        }
     }
 
     /**

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;

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;
 }