diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java
new file mode 100644
index 0000000..cb8c0b6
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java
@@ -0,0 +1,38 @@
+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 : ANDON_动作
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 9:47
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_ACTION")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_动作")
+public class AndonAction extends BaseBean {
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam(value = "动作代码")
+    private String actionCode;
+
+    @Column(name = "ACTION_NAME")
+    @ApiParam(value = "动作名称")
+    private String actionName;
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java
new file mode 100644
index 0000000..5487c78
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java
@@ -0,0 +1,42 @@
+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 : ANDON_呼叫原因
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 9:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_ALARM_CAUSE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_呼叫原因")
+public class AndonAlarmCause extends BaseBean {
+
+    @Column(name = "AC_CODE")
+    @ApiParam(value = "呼叫原因代码")
+    private String acCode;
+
+    @Column(name = "AC_NAME")
+    @ApiParam(value = "呼叫原因描述")
+    private String acName;
+
+    @Column(name = "PARENT_AC_CODE")
+    @ApiParam(value = "父阶原因代码")
+    private String parentAcCode;
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java
new file mode 100644
index 0000000..091ddec
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java
@@ -0,0 +1,54 @@
+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 : ANDON_呼叫通知配置
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 9:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_ALARM_RESPONSE_CFG")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_呼叫通知配置")
+public class AndonAlarmResponseCfg extends BaseBean {
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型代码")
+    private String alarmCode;
+
+    @Column(name = "ANDON_STATUS")
+    @ApiParam(value = "安灯状态")
+    private String andonStatus;
+
+    @Column(name = "RP_WHERE")
+    @ApiParam(value = "通知条件时长")
+    private String rpWhere;
+
+    @Column(name = "RP_CODE")
+    @ApiParam(value = "通知方式代码")
+    private String rpCode;
+
+    @Column(name = "RP_OBJECT_CODE")
+    @ApiParam(value = "通知对象代码")
+    private String rpObjectCode;
+
+    @Column(name = "RP_LEVEL")
+    @ApiParam(value = "通知级别")
+    private String rpLevel;
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java
index 2fcbd73..821efb7 100644
--- a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java
@@ -25,7 +25,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api(value="安灯类型",description = "安灯类型")
+@Api("安灯类型")
 public class AndonAlarmType extends BaseBean {
 
     @Column(name = "ALARM_CODE")
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java
new file mode 100644
index 0000000..1ed305d
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java
@@ -0,0 +1,42 @@
+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 : ANDON_事件原因
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 9:40
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_EVENT_CAUSE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_事件原因")
+public class AndonEventCause extends BaseBean {
+
+    @Column(name = "EC_CODE")
+    @ApiParam(value = "事件原因代码")
+    private String ecCode;
+
+    @Column(name = "EC_NAME")
+    @ApiParam(value = "事件原因描述")
+    private String ecName;
+
+    @Column(name = "PARENT_EC_CODE")
+    @ApiParam(value = "父阶原因代码")
+    private String parentEcCode;
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java
new file mode 100644
index 0000000..962309b
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java
@@ -0,0 +1,38 @@
+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 : ANDON_停机类型
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 9:45
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_HALT_TYPE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_停机类型")
+public class AndonHaltType extends BaseBean {
+
+    @Column(name = "HALT_CODE")
+    @ApiParam(value = "停机类型代码")
+    private String haltCode;
+
+    @Column(name = "HALT_NAME")
+    @ApiParam(value = "停机类型名称")
+    private String haltName;
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java
new file mode 100644
index 0000000..b241d49
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java
@@ -0,0 +1,219 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+import javax.persistence.Transient;
+
+/**
+ * @Description : 安灯队列
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2019-05-10 17:16
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_MANAGE_QUEUE")
+@DynamicInsert
+@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 = "安灯类型")
+    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;
+
+    @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",updatable = false)
+    @ApiParam(value = "呼叫时间")
+    @AnnoOutputColumn(hidden = true)
+    public String callTime;
+
+    @Transient
+    @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 callTimeStr;
+
+    @Column(name="CONFIRM_TIME",updatable = false)
+    @ApiParam(value = "响应时间")
+    @AnnoOutputColumn(hidden = true)
+    public String confirmTime;
+
+    @Transient
+    @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 confirmTimeStr;
+
+    @Column(name="RESET_TIME",updatable = false)
+    @ApiParam(value = "解决时间")
+    @AnnoOutputColumn(hidden = true)
+    public String resetTime;
+
+    @Transient
+    @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 resetTimeStr;
+
+    @Column(name = "CALL_USER")
+    @ApiParam(value = "呼叫人")
+    private String callUser;
+
+    @Column(name = "CONFIRM_USER")
+    @ApiParam(value = "响应人")
+    private String confirmUser;
+
+    @Column(name = "RESET_USER")
+    @ApiParam(value = "解决人")
+    private String resetUser;
+
+    @Column(name = "IS_SHIFT_CALL")
+    @ApiParam(value = "是否转呼", example = "1")
+    private Integer isShiftCall;
+
+    @Column(name="SHIFT_CALL_TIME",updatable = false)
+    @ApiParam(value = "转呼时间")
+    @AnnoOutputColumn(hidden = true)
+    public String shiftCallTime;
+
+    @Transient
+    @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 shiftCallTimeStr;
+
+    @Column(name = "RP_OBJECT_CODE")
+    @ApiParam(value = "转呼对象代码")
+    private String rpObjectCode;
+
+    @Column(name = "SC_RESPONSE_CODE")
+    @ApiParam(value = "转呼响应方式")
+    private String scObjectCode;
+
+    @Column(name = "SC_RP_LEVEL")
+    @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 ec_desc;
+
+    @Column(name = "EM_CODE")
+    @ApiParam(value = "事件方法代码")
+    private String emCode;
+
+    @Column(name = "EM_NAME_RDD")
+    @ApiParam(value = "事件方法描述")
+    private String emNameRdd;
+
+    @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;
+
+    // 是否转呼
+    public Integer getIsShiftCall() {
+        return this.isShiftCall == null ? 0 : this.isShiftCall;
+    }
+
+    // 获取优先级别
+    public Integer getPriorityLevel() {
+        return this.priorityLevel == null ? 0 : this.priorityLevel;
+    }
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java
new file mode 100644
index 0000000..38e3bbd
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java
@@ -0,0 +1,219 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+import javax.persistence.Transient;
+
+/**
+ * @Description : 安灯记录
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2019-05-10 17:16
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_MANAGE_RECORD")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("安灯记录")
+public class AndonManageRecord extends BaseBean {
+
+    @Column(name = "ANDON_ORDER_NO")
+    @ApiParam(value = "安灯队列编号")
+    private String andonOrderNo;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    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;
+
+    @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",updatable = false)
+    @ApiParam(value = "呼叫时间")
+    @AnnoOutputColumn(hidden = true)
+    public String callTime;
+
+    @Transient
+    @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 callTimeStr;
+
+    @Column(name="CONFIRM_TIME",updatable = false)
+    @ApiParam(value = "响应时间")
+    @AnnoOutputColumn(hidden = true)
+    public String confirmTime;
+
+    @Transient
+    @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 confirmTimeStr;
+
+    @Column(name="RESET_TIME",updatable = false)
+    @ApiParam(value = "解决时间")
+    @AnnoOutputColumn(hidden = true)
+    public String resetTime;
+
+    @Transient
+    @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 resetTimeStr;
+
+    @Column(name = "CALL_USER")
+    @ApiParam(value = "呼叫人")
+    private String callUser;
+
+    @Column(name = "CONFIRM_USER")
+    @ApiParam(value = "响应人")
+    private String confirmUser;
+
+    @Column(name = "RESET_USER")
+    @ApiParam(value = "解决人")
+    private String resetUser;
+
+    @Column(name = "IS_SHIFT_CALL")
+    @ApiParam(value = "是否转呼", example = "1")
+    private Integer isShiftCall;
+
+    @Column(name="SHIFT_CALL_TIME",updatable = false)
+    @ApiParam(value = "转呼时间")
+    @AnnoOutputColumn(hidden = true)
+    public String shiftCallTime;
+
+    @Transient
+    @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 shiftCallTimeStr;
+
+    @Column(name = "RP_OBJECT_CODE")
+    @ApiParam(value = "转呼对象代码")
+    private String rpObjectCode;
+
+    @Column(name = "SC_RESPONSE_CODE")
+    @ApiParam(value = "转呼响应方式")
+    private String scObjectCode;
+
+    @Column(name = "SC_RP_LEVEL")
+    @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 ec_desc;
+
+    @Column(name = "EM_CODE")
+    @ApiParam(value = "事件方法代码")
+    private String emCode;
+
+    @Column(name = "EM_NAME_RDD")
+    @ApiParam(value = "事件方法描述")
+    private String emNameRdd;
+
+    @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;
+
+    // 是否转呼
+    public Integer getIsShiftCall() {
+        return this.isShiftCall == null ? 0 : this.isShiftCall;
+    }
+
+    // 获取优先级别
+    public Integer getPriorityLevel() {
+        return this.priorityLevel == null ? 0 : this.priorityLevel;
+    }
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java
new file mode 100644
index 0000000..ae88bf0
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java
@@ -0,0 +1,74 @@
+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 : ANDON_PLC控制
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-10 17:32
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_PLC")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("安灯PLC控制")
+public class AndonPLC extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam(value = "工作中心名称")
+    private String workCenterName;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam(value = "工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CELL_NAME")
+    @ApiParam(value = "工作单元名称")
+    private String workCellName;
+
+    @Column(name = "NODE_CODE")
+    @ApiParam(value = "控制节点代码")
+    private String nodeCode;
+
+    @Column(name = "NODE_IP")
+    @ApiParam(value = "IP地址")
+    private String nodeIP;
+
+    @Column(name = "CHANNEL_NAME")
+    @ApiParam(value = "通道名称")
+    private String channelName;
+
+    @Column(name = "TAG_NAME")
+    @ApiParam(value = "标签名称")
+    private String tagName;
+
+    @Column(name = "TAG_ADDRESS")
+    @ApiParam(value = "标签地址")
+    private String tagAddress;
+
+    @Column(name = "TAG_TYPE")
+    @ApiParam(value = "标签类型")
+    private String tagType;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam(value = "分组号")
+    private String groupNo;
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java
new file mode 100644
index 0000000..4390a91
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java
@@ -0,0 +1,82 @@
+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 : ANDON_PLC监控记录
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-10 17:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_PLC_RECORD")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("安灯PLC监控记录")
+public class AndonPLCRecord extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam(value = "工作中心名称")
+    private String workCenterName;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam(value = "工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CELL_NAME")
+    @ApiParam(value = "工作单元名称")
+    private String workCellName;
+
+    @Column(name = "NODE_CODE")
+    @ApiParam(value = "控制节点代码")
+    private String nodeCode;
+
+    @Column(name = "NODE_IP")
+    @ApiParam(value = "IP地址")
+    private String nodeIP;
+
+    @Column(name = "CHANNEL_NAME")
+    @ApiParam(value = "通道名称")
+    private String channelName;
+
+    @Column(name = "TAG_NAME")
+    @ApiParam(value = "标签名称")
+    private String tagName;
+
+    @Column(name = "TAG_ADDRESS")
+    @ApiParam(value = "标签地址")
+    private String tagAddress;
+
+    @Column(name = "TAG_TYPE")
+    @ApiParam(value = "标签类型")
+    private String tagType;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam(value = "分组号")
+    private String groupNo;
+
+    @Column(name = "TAG_VALUE")
+    @ApiParam(value = "标签数值")
+    private String tagValue;
+
+    @Column(name = "TAG_POINT")
+    @ApiParam(value = "传递方向")
+    private String tagPoint;
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java
new file mode 100644
index 0000000..e3e23ba
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java
@@ -0,0 +1,38 @@
+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 : silliter.yuan
+ * @CreateDate : 2019-05-10 17:16
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_RESPONSE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("安灯通知方式")
+public class AndonResponse extends BaseBean {
+
+    @Column(name = "RESPONSE_CODE")
+    @ApiParam(value = "通知方式代码")
+    private String responseCode;
+
+    @Column(name = "RESPONSE_NAME")
+    @ApiParam(value = "通知方式名称")
+    private String responseName;
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java
new file mode 100644
index 0000000..fda0737
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java
@@ -0,0 +1,42 @@
+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 : silliter.yuan
+ * @CreateDate : 2019-05-10 17:16
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_RESPONSE_OBJECT")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("安灯通知对象")
+public class AndonResponseObject extends BaseBean {
+
+    @Column(name = "RP_OBJECT_CODE")
+    @ApiParam(value = "对象代码")
+    private String rpObjectCode;
+
+    @Column(name = "RP_OBJECT_NAME")
+    @ApiParam(value = "对象名称")
+    private String rpObjectName;
+
+    @Column(name = "RP_OBJECT_VALUE")
+    @ApiParam(value = "对象值")
+    private String rpObjectValue;
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java
new file mode 100644
index 0000000..a5ee2db
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java
@@ -0,0 +1,38 @@
+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 : silliter.yuan
+ * @CreateDate : 2019-05-10 17:16
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_STATUS")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("安灯状态")
+public class AndonStatus extends BaseBean {
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam(value = "状态代码")
+    private String statusCode;
+
+    @Column(name = "STATUS_NAME")
+    @ApiParam(value = "状态名称")
+    private String statusName;
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java
new file mode 100644
index 0000000..008a3ca
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAction;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制（ANDON_动作）
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 11:05
+ * @Modify:
+ **/
+@Repository
+public interface IAndonActionRepository extends BaseRepository<AndonAction, Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java
new file mode 100644
index 0000000..840cb42
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制（ANDON_呼叫原因）
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonAlarmCauseRepository extends BaseRepository<AndonAlarmCause, Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java
new file mode 100644
index 0000000..65109cf
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmResponseCfg;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制（ANDON_呼叫通知配置）
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 11:09
+ * @Modify:
+ **/
+@Repository
+public interface IAndonAlarmResponseCfgRepository extends BaseRepository<AndonAlarmResponseCfg, Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java
new file mode 100644
index 0000000..53817cb
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonEventCause;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制（ANDON_事件原因）
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 11:10
+ * @Modify:
+ **/
+@Repository
+public interface IAndonEventCauseRepository extends BaseRepository<AndonEventCause, Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java
new file mode 100644
index 0000000..81a68b8
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonHaltType;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制（ANDON_停机类型）
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 11:12
+ * @Modify:
+ **/
+@Repository
+public interface IAndonHaltTypeRepository extends BaseRepository<AndonHaltType, Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java
new file mode 100644
index 0000000..e4027cc
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonManageQueue;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(安灯队列信息)
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2019-05-10 17:27
+ * @Modify:
+ **/
+@Repository
+public interface IAndonManagetQueueRepository extends BaseRepository<AndonManageQueue,Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java
new file mode 100644
index 0000000..13623d0
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonManageRecord;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(安灯记录信息)
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2019-05-10 17:27
+ * @Modify:
+ **/
+@Repository
+public interface IAndonManagetRecordRepository extends BaseRepository<AndonManageRecord,Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java
new file mode 100644
index 0000000..f9838e3
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonPLCRecord;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制（安灯PLC监控记录）
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 11:15
+ * @Modify:
+ **/
+@Repository
+public interface IAndonPLCRecordRepository extends BaseRepository<AndonPLCRecord, Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java
new file mode 100644
index 0000000..3358aa0
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonPLC;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制（安灯PLC控制）
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 11:13
+ * @Modify:
+ **/
+@Repository
+public interface IAndonPLCRepository extends BaseRepository<AndonPLC, Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java
new file mode 100644
index 0000000..76723f9
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonResponseObject;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(安灯通知对象信息)
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2019-05-10 17:27
+ * @Modify:
+ **/
+@Repository
+public interface IAndonResponseObjectRepository extends BaseRepository<AndonResponseObject,Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java
new file mode 100644
index 0000000..3c2dc3d
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonResponse;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(安灯通知方式信息)
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2019-05-10 17:27
+ * @Modify:
+ **/
+@Repository
+public interface IAndonResponseRepository extends BaseRepository<AndonResponse,Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java
new file mode 100644
index 0000000..e33d81f
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonStatus;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(安灯状态信息)
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2019-05-10 17:27
+ * @Modify:
+ **/
+@Repository
+public interface IAndonStatusRepository extends BaseRepository<AndonStatus,Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java
new file mode 100644
index 0000000..5ed8956
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java
@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-29-11:58
+ * @Modify:
+ **/
+public class RequestModel {
+
+    private List<MesWorkOrder> workOrderList;
+
+    private List<MesPart> partList;
+
+    private List<MesPlanOrder> planOrderList;
+
+    public RequestModel(List<MesWorkOrder> workOrderList, List<MesPart> partList) {
+        this.workOrderList = workOrderList;
+        this.partList = partList;
+    }
+
+    public List<MesWorkOrder> getWorkOrderList() {
+        return workOrderList;
+    }
+
+    public RequestModel() {
+    }
+
+    public void setWorkOrderList(List<MesWorkOrder> workOrderList) {
+        this.workOrderList = workOrderList;
+    }
+
+    public List<MesPart> getPartList() {
+        return partList;
+    }
+
+    public void setPartList(List<MesPart> partList) {
+        this.partList = partList;
+    }
+
+    public List<MesPlanOrder> getPlanOrderList() {
+        return planOrderList;
+    }
+
+    public void setPlanOrderList(List<MesPlanOrder> planOrderList) {
+        this.planOrderList = planOrderList;
+    }
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index 63e0908..ea79718 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -45,10 +45,10 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
 
         if (StringUtils.isNotEmpty(mesPlanOrder.getOrderNo())) {
-            DdlPreparedPack.getStringEqualPack(mesPlanOrder.getOrderNo(), "orderNo", packBean);
+            DdlPreparedPack.getStringLikerPack(mesPlanOrder.getOrderNo(), "orderNo", packBean);
         }
         if (StringUtils.isNotEmpty(mesPlanOrder.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(mesPlanOrder.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(mesPlanOrder.getPartNo(), "partNo", packBean);
         }
         if (StringUtils.isNotEmpty(mesPlanOrder.getPlanType() + "") && mesPlanOrder.getPlanTypeVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesPlanOrder.getPlanType(), "planType", packBean);
@@ -172,15 +172,19 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoEnd() + "")) {
             DdlPreparedPack.getStringSmallerPack(mesQueueOrder.getCustFlagNoEnd(), "custFlagNo", packBean);
         }
+
+        // 只查询创建状态的队列
         DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean);
+
         // 时间段查询
         DdlPreparedPack.timeBuilder(
                 mesQueueOrder.getCreateDateTimeStart(),
                 mesQueueOrder.getCreateDateTimeEnd(),
                 "createDatetime", packBean, true);
 
-        DdlPreparedPack.getOrderDefault(mesQueueOrder);
-        DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesQueueOrder.getOrderByParam()} , packBean);
+        // DdlPreparedPack.getOrderDefault(mesQueueOrder);
+        // 按照队列序列号倒序
+        DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{"seq"} , packBean);
         return packBean;
     }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index adbb369..2108003 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -170,6 +170,18 @@ public class WmsDocMovementDetails extends BaseBean {
     @Transient
     public Double inputMoveQty;
 
+    @Transient
+    @ApiParam(value ="标准包装",example = "1")
+    private Double snp;
+
+    @Transient
+    @ApiParam(value ="条码总数量",example = "1")
+    private Double detailsSnCount;
+
+    @Transient
+    @ApiParam(value ="余数",example = "1")
+    private Double restQty;
+
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
     }