【2890 10 2.3.8安灯作业优化】

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java

@@ -294,6 +294,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
     @ApiParam(value ="故障时长-分钟")
     private Integer brokenTime;
 
+    @Transient
+    @ApiParam(value ="故障字符串")
+    private String faultStr;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java

@@ -36,7 +36,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api("安灯记录")
+@Api("去去去去去去去去去安灯记录")
 public class AndonManageRecord extends BaseManageQueue implements Serializable {
 
     private static final long serialVersionUID = 4667499369694353351L;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java

@@ -103,4 +103,8 @@ public class AndonQueueAttach extends BaseBean implements Serializable {
     @ApiParam(value ="生产累计件数")
     private Integer totalProdNum;
 
+    @Column(name="FAULT_STR")
+    @ApiParam(value ="故障字符串")
+    private String faultStr;
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java

@@ -904,6 +904,7 @@ public class AndonEnumUtil {
     /**
      * 按灯业务状态
      * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40, 安灯子类型=50, 原因代码=60, 产品信息=70， 产品产量=80
+     * 20201027 增加安灯状态 90 =优先级, 10 =故障字符串
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_BUSI_FLAG{
@@ -914,7 +915,9 @@ public class AndonEnumUtil {
         DETAIL_TYPE("50", "安灯子类型"),
         AC_CODE("60", "原因代码"),
         PROD_INFO("70", "产品信息"),
-        LINE_INFO("80", "产量信息");
+        LINE_INFO("80", "产量信息"),
+        PRIORITY_LEVEL("90", "优先级"),
+        FAULT_STR("100", "故障字符串");
 
         private String value;
         private String description;
@@ -1063,7 +1066,8 @@ public class AndonEnumUtil {
     public enum ALARM_PRIORITY{
         FIRST(10,"一级"),
         SECOND(20,"二级"),
-        THIRD(30,"三级");
+        THIRD(30,"三级"),
+        FOUR(40,"四级");
 
         private int value;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -1454,7 +1454,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WC_CHECK_TYPE {
         MATERIAL(10, "MATERIAL", "物料"),
-        ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号");
+        ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号"),
+        WORK_ORDER(30, "WORK_ORDER", "工单信息");
 
         private int value;
         private String code;