diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java
new file mode 100644
index 0000000..835046b
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java
@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue;
+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-10-18-9:13
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_KNOWLEDGE_BASE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON知识库")
+public class AndonKnowledgeBase extends BaseManageQueue {
+    @Column(name = "FLOW_STATUS")
+    @ApiParam(value = "审批状态")
+    private Integer flowStatus;
+
+    @Column(name = "FLOW_MEMO")
+    @ApiParam(value = "审批意见")
+    private String flowMemo;
+
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
index ae634b1..573ca3e 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.andon.bean;
 
+import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
@@ -40,77 +41,11 @@ import java.util.List;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯队列")
-public class AndonManageQueue extends BaseBean {
-
-    @Column(name = "ANDON_ORDER_NO")
-    @ApiParam(value = "安灯队列编号")
-    private String andonOrderNo;
-
-    @Column(name = "ALARM_CODE")
-    @ApiParam(value = "安灯类型")
-    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
-    private String alarmCode;
-
-    @Column(name = "ACTION_CODE")
-    @ApiParam(value = "安灯动作代码")
-    private String actionCode;
-
-    @Column(name = "WORK_CENTER_CODE")
-    @ApiParam(value = "工作中心代码")
-    private String workCenterCode;
-
-    @Column(name = "WORK_CENTER_NAME_RDD")
-    @ApiParam(value = "工作中心名称")
-    private String workCenterNameRdd;
-
-    @Column(name = "WORK_CELL_NAME_RDD")
-    @ApiParam(value = "工作单元名称")
-    private String workCellNameRdd;
-
-    @Column(name = "WORK_CELL_CODE")
-    @ApiParam(value = "工作单元代码")
-    private String workCellCode;
-
-    @Column(name = "EQUIPMENT_CODE")
-    @ApiParam(value = "设备代码")
-    private String equipmentCode;
-
-    @Column(name = "EQUIPMENT_NAME_RDD")
-    @ApiParam(value = "设备名称")
-    private String equipmentNameRdd;
-
-    @Column(name = "SHIFT_CODE")
-    @ApiParam(value = "班次代码")
-    private String shiftCode;
-
-    @Column(name = "SHIFT_NAME_RDD")
-    @ApiParam(value = "班次名称")
-    private String shiftNameRdd;
-
-    @Column(name = "STATUS_CODE")
-    @ApiParam(value = "安灯状态代码")
-    private String statusCode;
-
+public class AndonManageQueue extends BaseManageQueue {
     @Column(name = "SEQ")
     @ApiParam(value = "序号", example = "1")
     private Double seq;
 
-    @Column(name = "PRIORITY_LEVEL")
-    @ApiParam(value = "优先级别", example = "1")
-    private Integer priorityLevel;
-
-    @Column(name="CALL_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00")
-    @AnnoOutputColumn(hidden = true)
-    public String callTime;
-
-    @Column(name="CLOSE_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="撤销时间",example = "2018-01-01 01:00:00")
-    @AnnoOutputColumn(hidden = true)
-    public String closeTime;
-
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="呼叫时间，查询开始时间", example = "2018-01-01 01:00:00")
@@ -121,42 +56,14 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value="呼叫时间，查询结束时间", example = "2018-01-01 01:00:00")
     public String callTimeEnd;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @Column(name="CONFIRM_TIME")
-    @ApiParam(value = "响应时间", example = "2018-01-01 01:00:00")
-    @AnnoOutputColumn(hidden = true)
-    public String confirmTime;
-
-    @Column(name="RESET_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="解决时间",example = "2018-01-01 01:00:00")
-    @AnnoOutputColumn(hidden = true)
-    public String resetTime;
-
-    @Column(name = "CALL_USER")
-    @ApiParam(value = "呼叫人")
-    private String callUser;
-
-    @Column(name = "CLOSE_USER")
-    @ApiParam(value = "撤销人")
-    private String closeUser;
-
     @Transient
     @ApiParam(value = "呼叫人名字")
     private String callUserName;
 
-    @Column(name = "CONFIRM_USER")
-    @ApiParam(value = "响应人")
-    private String confirmUser;
-
     @Transient
     @ApiParam(value = "响应人名字")
     private String confirmUserName;
 
-    @Column(name = "RESET_USER")
-    @ApiParam(value = "解决人")
-    private String resetUser;
-
     @Column(name = "SOURCE_TYPE")
     @ApiParam(value = "安灯来源类型")
     private String sourceType = AndonEnumUtil.ALARM_SOURCE_TYPE.SOFT.getValue();
@@ -187,58 +94,6 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "转呼通知等级")
     private String scRpLevel;
 
-    @Column(name = "AC_CODE")
-    @ApiParam(value = "呼叫原因代码")
-    private String acCode;
-
-    @Column(name = "AC_NAME_RDD")
-    @ApiParam(value = "呼叫原因描述")
-    private String acNameRdd;
-
-    @Column(name = "AC_DESC")
-    @ApiParam(value = "呼叫具体原因")
-    private String acDesc;
-
-    @Column(name = "EC_CODE")
-    @ApiParam(value = "事件原因代码")
-    private String ecCode;
-
-    @Column(name = "EC_NAME_RDD")
-    @ApiParam(value = "事件原因描述")
-    private String ecNameRdd;
-
-    @Column(name = "EC_DESC")
-    @ApiParam(value = "事件具体原因")
-    private String ecDesc;
-
-    @Column(name = "EM_CODE")
-    @ApiParam(value = "事件方法代码")
-    private String emCode;
-
-    @Column(name = "EM_NAME_RDD")
-    @ApiParam(value = "事件方法描述")
-    private String emNameRdd;
-
-    @Column(name = "CLOSE_CAUSE")
-    @ApiParam(value = "撤销原因")
-    private String closeCause;
-
-    @Column(name = "EM_DESC")
-    @ApiParam(value = "事件具体方法")
-    private String emDesc;
-
-    @Column(name = "IS_HALT")
-    @ApiParam(value = "是否停机", example = "1")
-    private Integer isHalt;
-
-    @Column(name = "HALT_CODE")
-    @ApiParam(value = "停机类型")
-    private String haltCode;
-
-    @Column(name = "HALT_DESC")
-    @ApiParam(value = "停机具体原因")
-    private String haltDesc;
-
     @Transient
     @ApiParam(value = "异常时长", example = "0")
     private Long execptionTime;
@@ -288,23 +143,12 @@ public class AndonManageQueue extends BaseBean {
     private String signSendFlag;
 
     /**
-     * 处理类型：10=标准处理，20=自处理
-     */
-    @Column(name = "DISPOSAL_TYPE")
-    @ApiParam(value = "处理类型")
-    private String disposalType;
-
-    /**
      * 1 = 是，2 = 否
      */
     @Transient
     @ApiParam(value = "是否勾选加入自处理问题库", example = "2")
     private Integer isDisposal;
 
-    @Column(name = "ALARM_DETAIL_CODE")
-    @ApiParam(value = "安灯子类型代码")
-    private String alarmDetailCode;
-
     @Column(name = "ALARM_DETAIL_NAME_RDD")
     @ApiParam(value = "安灯子类型名称")
     private String alarmDetailNameRdd;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java
new file mode 100644
index 0000000..5585338
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java
@@ -0,0 +1,180 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.MappedSuperclass;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-10-18-8:36
+ * @Modify:
+ **/
+@Data
+@MappedSuperclass
+public class BaseManageQueue extends BaseBean {
+
+    @Column(name = "ANDON_ORDER_NO")
+    @ApiParam(value = "安灯队列编号")
+    public String andonOrderNo;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
+    public String alarmCode;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam(value = "安灯动作代码")
+    public String actionCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心代码")
+    public String workCenterCode;
+
+    @Column(name = "WORK_CENTER_NAME_RDD")
+    @ApiParam(value = "工作中心名称")
+    public String workCenterNameRdd;
+
+    @Column(name = "WORK_CELL_NAME_RDD")
+    @ApiParam(value = "工作单元名称")
+    public String workCellNameRdd;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam(value = "工作单元代码")
+    public String workCellCode;
+
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam(value = "设备代码")
+    public String equipmentCode;
+
+    @Column(name = "EQUIPMENT_NAME_RDD")
+    @ApiParam(value = "设备名称")
+    public String equipmentNameRdd;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam(value = "班次代码")
+    public String shiftCode;
+
+    @Column(name = "SHIFT_NAME_RDD")
+    @ApiParam(value = "班次名称")
+    public String shiftNameRdd;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam(value = "安灯状态代码")
+    public String statusCode;
+
+    @Column(name = "PRIORITY_LEVEL")
+    @ApiParam(value = "优先级别", example = "1")
+    public Integer priorityLevel;
+
+    @Column(name="CALL_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00")
+    @AnnoOutputColumn(hidden = true)
+    public String callTime;
+
+    @Column(name="CLOSE_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="撤销时间",example = "2018-01-01 01:00:00")
+    @AnnoOutputColumn(hidden = true)
+    public String closeTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Column(name="CONFIRM_TIME")
+    @ApiParam(value = "响应时间", example = "2018-01-01 01:00:00")
+    @AnnoOutputColumn(hidden = true)
+    public String confirmTime;
+
+    @Column(name="RESET_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="解决时间",example = "2018-01-01 01:00:00")
+    @AnnoOutputColumn(hidden = true)
+    public String resetTime;
+
+    @Column(name = "CALL_USER")
+    @ApiParam(value = "呼叫人")
+    public String callUser;
+
+    @Column(name = "CLOSE_USER")
+    @ApiParam(value = "撤销人")
+    public String closeUser;
+
+    @Column(name = "CONFIRM_USER")
+    @ApiParam(value = "响应人")
+    public String confirmUser;
+
+    @Column(name = "RESET_USER")
+    @ApiParam(value = "解决人")
+    public String resetUser;
+
+    @Column(name = "CLOSE_CAUSE")
+    @ApiParam(value = "撤销原因")
+    public String closeCause;
+
+    @Column(name = "AC_CODE")
+    @ApiParam(value = "呼叫原因代码")
+    public String acCode;
+
+    @Column(name = "AC_NAME_RDD")
+    @ApiParam(value = "呼叫原因描述")
+    public String acNameRdd;
+
+    @Column(name = "AC_DESC")
+    @ApiParam(value = "呼叫具体原因")
+    public String acDesc;
+
+    @Column(name = "EC_CODE")
+    @ApiParam(value = "事件原因代码")
+    public String ecCode;
+
+    @Column(name = "EC_NAME_RDD")
+    @ApiParam(value = "事件原因描述")
+    public String ecNameRdd;
+
+    @Column(name = "EC_DESC")
+    @ApiParam(value = "事件具体原因")
+    public String ecDesc;
+
+    @Column(name = "EM_CODE")
+    @ApiParam(value = "事件方法代码")
+    public String emCode;
+
+    @Column(name = "EM_NAME_RDD")
+    @ApiParam(value = "事件方法描述")
+    public String emNameRdd;
+    
+
+    @Column(name = "EM_DESC")
+    @ApiParam(value = "事件具体方法")
+    public String emDesc;
+
+    @Column(name = "IS_HALT")
+    @ApiParam(value = "是否停机", example = "1")
+    public Integer isHalt;
+
+    @Column(name = "HALT_CODE")
+    @ApiParam(value = "停机类型")
+    public String haltCode;
+
+    @Column(name = "HALT_DESC")
+    @ApiParam(value = "停机具体原因")
+    public String haltDesc;
+
+    /**
+     * 处理类型：10=标准处理，20=自处理
+     */
+    @Column(name = "DISPOSAL_TYPE")
+    @ApiParam(value = "处理类型")
+    public String disposalType;
+
+    @Column(name = "ALARM_DETAIL_CODE")
+    @ApiParam(value = "安灯子类型代码")
+    public String alarmDetailCode;
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonKnowledgeBaseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonKnowledgeBaseRepository.java
new file mode 100644
index 0000000..2e3036f
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonKnowledgeBaseRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonKnowledgeBase;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description: 知识库管理
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-10-18-9:16
+ * @Modify:
+ **/
+@Repository
+public interface IAndonKnowledgeBaseRepository extends BaseRepository<AndonKnowledgeBase, Long> {
+}