diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
new file mode 100644
index 0000000..ebd53c3
--- /dev/null
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>i3plus-pojo</artifactId>
+        <groupId>i3plus.pojo</groupId>
+        <version>1.0-DEV-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>i3plus-pojo-andon</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-base</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java
new file mode 100644
index 0000000..cb8c0b6
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java
new file mode 100644
index 0000000..5487c78
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java
new file mode 100644
index 0000000..091ddec
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java
new file mode 100644
index 0000000..821efb7
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.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_ALARM_TYPE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("安灯类型")
+public class AndonAlarmType extends BaseBean {
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型代码")
+    private String alarmCode;
+
+    @Column(name = "ALARM_NAME")
+    @ApiParam(value = "安灯类型名称")
+    private String alarmName;
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java
new file mode 100644
index 0000000..1ed305d
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java
new file mode 100644
index 0000000..962309b
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/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
new file mode 100644
index 0000000..b241d49
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java
new file mode 100644
index 0000000..38e3bbd
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java
new file mode 100644
index 0000000..ae88bf0
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java
new file mode 100644
index 0000000..4390a91
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java
new file mode 100644
index 0000000..e3e23ba
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java
new file mode 100644
index 0000000..fda0737
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java
new file mode 100644
index 0000000..a5ee2db
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java
new file mode 100644
index 0000000..008a3ca
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java
new file mode 100644
index 0000000..840cb42
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java
new file mode 100644
index 0000000..65109cf
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java
new file mode 100644
index 0000000..31afb4f
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType;
+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 IAndonAlarmTypeRepository extends BaseRepository<AndonAlarmType,Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java
new file mode 100644
index 0000000..53817cb
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java
new file mode 100644
index 0000000..81a68b8
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java
new file mode 100644
index 0000000..e4027cc
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java
new file mode 100644
index 0000000..13623d0
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java
new file mode 100644
index 0000000..f9838e3
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java
new file mode 100644
index 0000000..3358aa0
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java
new file mode 100644
index 0000000..76723f9
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java
new file mode 100644
index 0000000..3c2dc3d
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java
new file mode 100644
index 0000000..e33d81f
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/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-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
new file mode 100644
index 0000000..12b3098
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.andon.sqlpack;
+
+/**
+ * @Description : 安灯对象查询封装
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2019-05-10 10:45
+ * @Modify:
+ **/
+public class AndonHqlPack {
+}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
index 6c19f95..43adf39 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
@@ -28,8 +28,10 @@ public class CommonEnumUtil {
         REPORT(21,"block-report","智能报表"),
         WORKFLOW(22,"block-workflow","智能工作流"),
         JOBFLOW(23,"block-jobflow","智能作业流"),
-        SOFTSWITCH(24,"block-softswitch","智能软件适配器"),
-        HARDSWITCH(25,"block-hardswitch","智能硬件适配器"),
+        SOFTSWITCH(24,"block-softswitch","软件适配器"),
+        HARDSWITCH(25,"block-hardswitch","硬件适配器"),
+        LAC(26,"link-connect","连接适配器"),
+        ANDON(27,"andon","安灯"),
         CENTER(99,"icloud-server","注册中心"),
         SURFACE(98,"i3surface","对外服务"),
         CLOUD(97,"i3cloud","微服务"),
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index a7949c1..e8a6b83 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -139,17 +139,17 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MASTER_ORDER_STATUS {
-        CREATE(10, "CREATE","新建"),
-        RECEIPT(20, "RECEIPT","处理中"),
-        RECEIPT_FINISH(30, "RECEIPT_FINISH","已完成"),
-        CLOSED(40, "CLOSED","已关闭"),
-        CANCELLED(50, "CANCELLED","已取消");
+        CREATE(10, "CREATE", "新建"),
+        RECEIPT(20, "RECEIPT", "处理中"),
+        RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"),
+        CLOSED(40, "CLOSED", "已关闭"),
+        CANCELLED(50, "CANCELLED", "已取消");
 
         private int value;
         private String code;
         private String description;
 
-        MASTER_ORDER_STATUS(int value,String code, String description) {
+        MASTER_ORDER_STATUS(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -670,6 +670,40 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 作业组件参数：组件执行方法名称
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MODULE_METHOD_NAME {
+        EXECUTE("execute", "执行方法"),
+        GETOPTIONS("getOptions", "流程初始化方法"),
+        PROMPT("prompt", "初始化方法"),
+        GETLIST("getList", "获取列表数据"),
+        DOCOMPLETE("doComplete", "执行完成方法"),
+        SHOWINFORMATION("showInformation", "回显方法"),
+        INSTALL("install", "安装组件"),
+        UNINSTALL("unInstall", "卸载组件");
+        private String value;
+        private String description;
+
+        MODULE_METHOD_NAME(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+
 
     /**
      * 作业任务状态、移库单条码操作状态
@@ -1456,6 +1490,16 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static COMPONENT_TYPE switchGetValue(int val) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
     }
 
     /**
@@ -2109,11 +2153,11 @@ public class WmsEnumUtil {
      * 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本
      */
     public enum SCRIPT_TYPE {
-        MODUAL(10,"Modual","组件脚本"),
-        FORM(20,"Form","表单脚本"),
-        REPORT(30,"Report","报表脚本"),
-        JOB(40,"Job","JOB脚本"),
-        OTHER(50,"Other","其他脚本");
+        MODUAL(10, "Modual", "组件脚本"),
+        FORM(20, "Form", "表单脚本"),
+        REPORT(30, "Report", "报表脚本"),
+        JOB(40, "Job", "JOB脚本"),
+        OTHER(50, "Other", "其他脚本");
 
         private String description;
         private int value;
@@ -2147,9 +2191,9 @@ public class WmsEnumUtil {
      * 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby
      */
     public enum LANGUAGE_TYPE {
-        GROOVY(1,"Groovy", 10),
-        PYTHON(2,"Python", 20),
-        JS(3,"JavaScript", 30);
+        GROOVY(1, "Groovy", 10),
+        PYTHON(2, "Python", 20),
+        JS(3, "JavaScript", 30);
         // 下面这2种语言没人会写，暂不支持
         //SCALA(40,"scala"),
         //JRUBY(50,"jruby");
@@ -2194,9 +2238,9 @@ public class WmsEnumUtil {
      * 2.BUSI：业务参数
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum WMS_CONFIG_TYPE{
+    public enum WMS_CONFIG_TYPE {
 
-        SYSTEM(10,"系统参数","系统参数"),
+        SYSTEM(10, "系统参数", "系统参数"),
         BUSI(20, "业务参数", "业务参数");
 
         private int value;
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
new file mode 100644
index 0000000..3681eb6
--- /dev/null
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>i3plus-pojo</artifactId>
+        <groupId>i3plus.pojo</groupId>
+        <version>1.0-DEV-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>i3plus-pojo-lac</artifactId>
+    <packaging>jar</packaging>
+
+
+</project>
\ No newline at end of file
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 3efc847..d7242d7 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
@@ -42,10 +42,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);
@@ -169,15 +169,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-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java
index 260eda7..048379c 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java
@@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -18,9 +19,10 @@ import java.util.List;
 **/
 @Data
 @Api("作业流程Model")
-public class WmsActionGroupModel {
+public class WmsActionGroupModel implements Serializable {
     @ApiParam("流程")
     public WmsActionGroup wmsActionGroup;
+
     @ApiParam("流程明细Model集合")
     public List<WmsActionGroupDetailsModel> wmsActionGroupDetailsModelList;
 }
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java
index 6f92321..96fa22a 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java
@@ -18,7 +18,7 @@ import java.text.DecimalFormat;
 import java.util.List;
 
 /**
- * @Description : 组织
+ * @Description : 组织 1.0
  * @Reference   :
  * @Author      : wei.peng
  * @Date        : 2018-10-22 16:58:42.923
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java
new file mode 100644
index 0000000..ee15a2a
--- /dev/null
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java
@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.sweb.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @Description : 待发布订单列表输出模型
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-02 13:13
+ * @Modify:
+ **/
+@Data
+public class SwebPOForPubListResultModelV2 extends BaseBean {
+
+    @ApiParam(value = "拆分请求时间数量列表", example = "1")
+    private List<String> reqTimeList = Collections.EMPTY_LIST;
+
+    @ApiParam(value = "列表", example = "1")
+    private List<SwebPOForPubListResultItemModel> list = Collections.EMPTY_LIST;
+}
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
index 2996182..93f65f4 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
@@ -121,7 +121,6 @@ public class SwebHqlPack {
 
     public static DdlPackBean getPurchaseOrderDetailsPublishListStatusWhereHql(SwebPurchaseOrderDetails details) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
         DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
         DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java
index 4830c63..df3f6d5 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java
@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -11,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 作业流程
@@ -24,44 +27,64 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_ACTION_GROUP")
+@Table(name = "WMS_ACTION_GROUP")
 @Api("作业流程")
 public class WmsActionGroup extends BaseBean {
 
-    @Column(name="AG_NAME_E")
+    @Column(name = "AG_NAME_E")
     @ApiParam("英文流程名称")
     private String agNameE;
 
-    @Column(name="AG_DESC_E")
+    @Column(name = "AG_DESC_E")
     @ApiParam("英文流程描述")
     private String agDescE;
 
-    @Column(name="AG_NAME_C")
+    @Column(name = "AG_NAME_C")
     @ApiParam("中文流程名称")
     private String agNameC;
 
-    @Column(name="AG_DESC_C")
+    @Column(name = "AG_DESC_C")
     @ApiParam("中文流程描述")
     private String agDescC;
 
-    @Column(name="INIT_AM_ID")
+    @Column(name = "INIT_AM_ID")
     @ApiParam(value = "初始化组件编号", example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long initAmId;
 
-    @Column(name="DETAILS_AM_ID")
+//    @Transient
+//    @ApiParam(value = "初始化组件名称")
+//    private String initAmName;
+
+    @Column(name = "DETAILS_AM_ID")
     @ApiParam(value = "明细处理组件编号", example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long detailsAmId;
 
-    @Column(name="SUBMIT_AM_ID")
+//    @Transient
+//    @ApiParam(value = "明细处理组件名称")
+//    private String detailsAmName;
+
+    @Column(name = "SUBMIT_AM_ID")
     @ApiParam(value = "提交组件编号", example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long submitAmId;
 
-    @Column(name="END_AM_ID")
+//    @Transient
+//    @ApiParam(value = "提交组件名称")
+//    private String submitAmName;
+
+    @Column(name = "END_AM_ID")
     @ApiParam(value = "结束组件编号", example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long endAmId;
+//
+//    @Transient
+//    @ApiParam(value = "结束组件名称")
+//    private String endAmName;
 
     // 1=true, 2 = false
-    @Column(name="AUTO_INIT")
+    @Column(name = "AUTO_INIT")
     @ApiParam(value = "任务自动初始化", example = "0")
     private Integer autoInit;
 
@@ -88,4 +111,7 @@ public class WmsActionGroup extends BaseBean {
             return endAmId;
         }
     }
+
+    public WmsActionGroup() {
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java
index d448205..54a9528 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java
@@ -87,5 +87,6 @@ public class WmsActionGroupDetails extends BaseBean {
 
     @Column(name = "SHOW_AM_ID")
     @ApiParam(value = "回显组件方法ID", example = "1")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long showAmId;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java
index 4198ff5..48c4aa2 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java
@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -50,6 +52,7 @@ public class WmsActionStep extends BaseBean {
 
     @Column(name = "AT_ID")
     @ApiParam(value = "步骤类型编号", example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long atId;
 
     //get单独处理
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;
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index f53fe7d..0f3f1e6 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -25,13 +25,6 @@ import java.util.stream.Collectors;
  **/
 public class WmsHqlPack {
 
-    public static String packInParams(String colnumName, String[] params) {
-        StringBuffer sb = new StringBuffer();
-        HqlPack.getInPackString(String.join(",", params), colnumName, sb);
-        HqlPack.getNumEqualPack(WmsEnumUtil.IS_PART.IS_ADJUST.getValue(), "snControl", sb);
-        return sb.toString();
-    }
-
     /**
      * 封装公用查询参数
      *
@@ -54,27 +47,6 @@ public class WmsHqlPack {
     }
 
     /**
-     * 封装公用查询参数
-     *
-     * @param bean   实体对象
-     * @param hqlStr 查询语句
-     * @return 封装完成的查询语句
-     */
-    public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) {
-
-        // 判断工厂代码是否为空
-        if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
-            HqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
-        }
-
-        // 封装有效状态和删除状态
-        HqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
-
-        return hqlStr.toString();
-    }
-
-    /**
      * PO订单明细表 分页查询
      *
      * @param wmsPOMasterDetails
@@ -202,14 +174,14 @@ public class WmsHqlPack {
      * @param routingCode
      * @return
      */
-    public static String packHqlWmsRoutingChildren(String routingCode) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlWmsRoutingChildren(String routingCode) {
+        DdlPackBean result = new DdlPackBean();
 
-        HqlPack.getStringEqualPack(routingCode, "routingCode", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
+        DdlPreparedPack.getStringEqualPack(routingCode, "routingCode", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
                 "isDeleted", result);
 
-        return result.toString();
+        return result;
     }
 
 
@@ -219,14 +191,14 @@ public class WmsHqlPack {
      * @param wmsRoutingMaster
      * @return
      */
-    public static String packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) {
-        StringBuffer result = new StringBuffer();
-        HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result);
-        HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result);
+    public static DdlPackBean packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result);
+        DdlPreparedPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result);
 
         getStringBuilderPack(wmsRoutingMaster, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -235,18 +207,18 @@ public class WmsHqlPack {
      * @param wmsPart
      * @return
      */
-    public static String packHqlWmsPart(WmsPart wmsPart) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlWmsPart(WmsPart wmsPart) {
+        DdlPackBean result = new DdlPackBean();
 
-        HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
-        HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
-        HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
-        HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
-        HqlPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result);
+        DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
+        DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
+        DdlPreparedPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
+        DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result);
 
         getStringBuilderPack(wmsPart, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -293,26 +265,6 @@ public class WmsHqlPack {
     }
 
     /**
-     * 库存交易记录信息 分页查询
-     *
-     * @param wmsTrans
-     * @return
-     */
-    public static String packHqlWmsTrans(WmsTrans wmsTrans) {
-        StringBuffer result = new StringBuffer();
-
-        //查询参数封装
-        HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result);
-        HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result);
-        HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true);
-
-        getStringBuilderPack(wmsTrans, result);
-
-        return result.toString();
-    }
-
-
-    /**
      * 供应商分页查询
      *
      * @param basVendor
@@ -467,25 +419,6 @@ public class WmsHqlPack {
         return result;
     }
 
-    /**
-     * 供应商唯一性校验查询条件【用于添加和修改】
-     *
-     * @param basVendor
-     * @return
-     */
-    public static DdlPackBean packHqlBasVendorUnique(BasVendor basVendor) {
-        DdlPackBean result = new DdlPackBean();
-
-        DdlPreparedPack.getNumNOEqualPack(basVendor.getId(), "id", result);
-        DdlPreparedPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result);
-        DdlPreparedPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result);
-        DdlPreparedPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result);
-
-        getStringBuilderPack(basVendor, result);
-
-        return result;
-    }
-
     public static DdlPackBean packHqlWmsOpTypeUnique(WmsOpType wmsOpType) {
         DdlPackBean result = new DdlPackBean();
 
@@ -498,38 +431,6 @@ public class WmsHqlPack {
     }
 
     /**
-     * 查询满足处理周期的作业类型 查询条件封装
-     *
-     * @param wmsOpType
-     * @return
-     */
-    public static String packHqlWmsOpTypeTime(WmsOpType wmsOpType) {
-        StringBuffer result = new StringBuffer();
-
-        getStringBuilderPack(wmsOpType, result);
-        result.append(" and isnull(model.lastTransTime) or timestampdiff(Minute,nvl(model.lastTransTime,'2000'),now()) >= model.cycleMins");
-        return result.toString();
-    }
-
-    /**
-     * 作业任务数据来源 查询条件封装
-     *
-     * @param wmsTaskSrc
-     * @return
-     */
-    public static String packHqlWmsTaskSrc(WmsTaskSrc wmsTaskSrc) {
-        StringBuffer result = new StringBuffer();
-
-        //作业类型代码
-        HqlPack.getStringLikerPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result);
-
-        getStringBuilderPack(wmsTaskSrc, result);
-
-        return result.toString();
-    }
-
-
-    /**
      * 客户信息 查询条件封装
      *
      * @param basCustomer
@@ -805,25 +706,25 @@ public class WmsHqlPack {
      * @param wmsAreaOwner 责任区分配信息
      * @return 责任区分配信息
      */
-    public static String packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) {
+        DdlPackBean result = new DdlPackBean();
 
         // 仓库代码
-        HqlPack.getStringEqualPack(wmsAreaOwner.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getWhNo(), "whNo", result);
         // 来源单据号
-        HqlPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result);
         // 供应商编码
-        HqlPack.getStringEqualPack(wmsAreaOwner.getVendorNo(), "vendorNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getVendorNo(), "vendorNo", result);
         // 物料编码
-        HqlPack.getStringEqualPack(wmsAreaOwner.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getPartNo(), "partNo", result);
         // 负责人
-        HqlPack.getStringEqualPack(wmsAreaOwner.getOwnerUserNo(), "ownerUserNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getOwnerUserNo(), "ownerUserNo", result);
         // 是否预分配
-        HqlPack.getNumEqualPack(wmsAreaOwner.getIsPreAssign(), "isPreAssign", result);
+        DdlPreparedPack.getNumEqualPack(wmsAreaOwner.getIsPreAssign(), "isPreAssign", result);
 
         getStringBuilderPack(wmsAreaOwner, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1087,7 +988,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue() ,
+        DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue(),
                 WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue()}, "orderStatus", result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result);
         //单号
@@ -1238,7 +1139,8 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result);
+        DdlPreparedPack.getStringLikerPack(wmsActionStepType.getAtNameC(), "atNameC", result);
+        DdlPreparedPack.getStringLikerPack(wmsActionStepType.getFunCallName(), "funCallName", result);
 
         getStringBuilderPack(wmsActionStepType, result);
 
@@ -1291,7 +1193,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result);
-        DdlPreparedPack.getNumEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result);
         DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result);
 
         getStringBuilderPack(wmsActionModule, result);
@@ -1373,22 +1275,6 @@ public class WmsHqlPack {
     }
 
     /**
-     * 按moveNo 取最后一笔插入的数据
-     *
-     * @param wmsMoveSn
-     * @return
-     */
-    public static String packHqlLastWmsMoveSn(WmsMoveSn wmsMoveSn) {
-        StringBuffer result = new StringBuffer();
-
-        HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
-        getStringBuilderPack(wmsMoveSn, result);
-        HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
-
-        return result.toString();
-    }
-
-    /**
      * 根据条件查询库存条码信息
      *
      * @param wmsStockSn
@@ -1590,19 +1476,22 @@ public class WmsHqlPack {
      * @param wmsTransModule
      * @return
      */
-    public static String packHqlWmsTransModule(WmsTransModule wmsTransModule) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) {
+        DdlPackBean packBean = new DdlPackBean();
         if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) {
-            HqlPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result);
+            DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", packBean);
         }
         if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) {
-            HqlPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result);
+            DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", packBean);
         }
         if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) {
-            HqlPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result);
+            DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean);
         }
-        getStringBuilderPack(wmsTransModule, result);
-        return result.toString();
+        if (StringUtils.isNotBlank(wmsTransModule.orderBy())) {
+            packBean.setOrderByStr(wmsTransModule.orderBy());
+        }
+        getStringBuilderPack(wmsTransModule, packBean);
+        return packBean;
     }
 
     /**
@@ -1701,7 +1590,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() ,
+        DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue(),
                 WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue()}, "orderStatus", result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result);
diff --git a/pom.xml b/pom.xml
index e5f0bb0..1ce4f37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,8 @@
         <module>modules/i3plus-pojo-workflow</module>
         <module>modules/i3plus-pojo-mes-pcn</module>
         <module>modules/i3plus-pojo-sweb</module>
+        <module>modules/i3plus-pojo-andon</module>
+        <module>modules/i3plus-pojo-lac</module>
     </modules>
 
     <dependencies>