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
index 66591c5..034e022 100644
--- 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
@@ -135,4 +135,21 @@ public class AndonHqlPack {
 
         return result;
     }
+
+    /**
+     * 按条件查询按灯队列信息
+     * @param andonManageQueue
+     * @return
+     */
+    public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
+        getStringBuilderPack(andonManageQueue, result);
+
+        return result;
+    }
 }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
index 1f6e33a..37f53bd 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
@@ -46,4 +46,101 @@ public class AndonEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 按灯业务状态
+     * 安灯状态=10，工号 =20 ，读取状态=30
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ALARM_BUSI_FLAG{
+
+        ALARM_FLAG("10","按灯状态"),
+        USER_CODE("20","工号"),
+        READ_FLAG("30", "读取状态");
+
+        private String value;
+        private String description;
+
+        ALARM_BUSI_FLAG(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 按灯标识
+     * 1-呼叫，2-签到，3-解决
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ALARM_FLAG{
+
+        CALL(1,"呼叫"),
+        SIGN(2,"签到"),
+        RESOLVE(3, "解决"),
+        CANCEL(4, "撤销");
+
+        private int value;
+        private String description;
+
+        ALARM_FLAG(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 按灯动作标志
+     * 呼叫=10，签到 =20 ，撤销=30，40-解决，50-转呼
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ANDON_ACTION_FLAG{
+
+        CALL_ACTION("10","呼叫动作"),
+        SIGN_ACTION("20","签到动作"),
+        CANCEL_ACTION("30", "撤销动作"),
+        RESOLVE_ACTION("40", "解决动作"),
+        SHIFG_CALL_ACTION("50", "转呼动作");
+
+        private String value;
+        private String description;
+
+        ANDON_ACTION_FLAG(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java
new file mode 100644
index 0000000..8455e8e
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java
@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.model.andon;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class AndonResultBean {
+
+	@ApiParam("是否成功")
+	private boolean success;
+
+	@ApiParam("处理信息")
+	private String msg;
+
+	@ApiParam("处理结果")
+	private String result;
+
+	public AndonResultBean(boolean success, String msg) {
+		super();
+		this.success = success;
+		this.msg = msg;
+	}
+
+	public AndonResultBean(boolean success, String msg, String result) {
+		super();
+		this.success = success;
+		this.msg = msg;
+		this.result = result;
+	}
+}