安灯呼叫，开线逻辑调整； 安灯附属表业务添加；工位工作中心显示对应状态； 增加物理安灯，软件安灯逻辑

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

@@ -157,6 +157,10 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "解决人")
     private String resetUser;
 
+    @Column(name = "SOURCE_TYPE")
+    @ApiParam(value = "安灯来源类型")
+    private String sourceType = AndonEnumUtil.ALARM_SOURCE_TYPE.SOFT.getValue();
+
     @Transient
     @ApiParam(value = "解决人名字")
     private String resetUserName;

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 安灯任务附属表
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-09-27 19:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="ANDON_MANAGE_ATTACH")
+@Api(value="安灯任务附属信息")
+public class AndonQueueAttach extends BaseBean {
+
+    @Column(name="PROD_INFO")
+    @ApiParam(value ="产品信息" , example ="-1")
+    private String prodInfo;
+
+    @Column(name="LINE_INFO")
+    @ApiParam(value ="产线信息")
+    private String lineInfo;
+
+    @Column(name="ANDON_ORDER_NO")
+    @ApiParam(value ="安灯任务编号")
+    private String andonOrderNo;
+
+    @Column(name="STATUS_CODE")
+    @ApiParam(value ="安灯状态")
+    private String statusCode;
+}

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

@@ -49,6 +49,10 @@ public class MesWorkCell extends BaseBean {
     private String areaCode;
 
     @Transient
+    @ApiParam(value ="工作单元中安灯队列标识")
+    private String workCellSignal;
+
+    @Transient
     @ApiParam(value ="子集列表")
     @AnnoOutputColumn(hidden = true)
     private List<MesEquipment> childTreeList;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonQueueAttachRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause;
+import cn.estsh.i3plus.pojo.andon.bean.AndonQueueAttach;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 安灯附属表
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-09-28
+ * @Modify:
+ **/
+@Repository
+public interface IAndonQueueAttachRepository extends BaseRepository<AndonQueueAttach, Long> {
+}

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

@@ -58,6 +58,51 @@ public class AndonEnumUtil {
     }
 
     /**
+     * 标准类型 = 10，异常类型 = 20
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CELL_TYPE{
+        NORMAL("10","标准类型"),
+        ABNORMAL("20","异常类型");
+
+        private String value;
+        private String description;
+
+        WORK_CELL_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value,val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 审批状态：10=待审批，20=二级审批，30=三级审批，40=四级审批，100=已审批
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -199,7 +244,7 @@ public class AndonEnumUtil {
 
     /**
      * 按灯业务状态
-     * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40, 安灯子类型=50, 原因代码=60
+     * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40, 安灯子类型=50, 原因代码=60, 产品信息=70， 产品产量=80
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_BUSI_FLAG{
@@ -208,7 +253,9 @@ public class AndonEnumUtil {
         READ_FLAG("30", "安灯读取状态"),
         STOP_FLAG("40", "停线状态"),
         DETAIL_TYPE("50", "安灯子类型"),
-        AC_CODE("60", "原因代码");
+        AC_CODE("60", "原因代码"),
+        PROD_INFO("70", "产品信息"),
+        LINE_INFO("80", "产量信息");
 
         private String value;
         private String description;
@@ -362,6 +409,51 @@ public class AndonEnumUtil {
         }
     }
 
+    /**
+     * 安灯来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ALARM_SOURCE_TYPE{
+        PHYSICAL("10","物理安灯"),
+        SOFT("20","软件安灯");
+
+        private String value;
+        private String description;
+
+        ALARM_SOURCE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String val) {
+            String tmp = "";
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 
     /**
      * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测