安灯bug解决

1.操作详情中一直同一个工位同种呼叫同一个呼叫单任务有多条
2.PLC：安灯类型、标签地址、标签名字条件查询失效
3.通知对象：通知对象值不能修改
4.通知配置：页面数据显示不全。
5.事件原因：安灯类型条件查询失效

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java

@@ -120,7 +120,7 @@ public class AndonHqlPack {
     }
 
     /**
-     * 按条件查询ANDON呼叫原因
+     * 按条件查询ANDON呼叫原因,==
      * @param andonAlarmCause
      * @return
      */
@@ -134,6 +134,22 @@ public class AndonHqlPack {
 
         return result;
     }
+    /**
+     * 按条件模糊查询ANDON呼叫原因,
+     * @param andonAlarmCause
+     * @return
+     */
+    public static DdlPackBean packHqlAndonAlarmCauseLike(AndonAlarmCause andonAlarmCause){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcCode(),"acCode", result);
+        DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcName(),"acName", result);
+
+        getStringBuilderPack(andonAlarmCause, result);
+
+        return result;
+    }
 
     /**
      * 按条件查询ANDON事件处理方法
@@ -439,6 +455,11 @@ public class AndonHqlPack {
      */
     public static DdlPackBean packAndonEventCause(AndonEventCause andonEventCause) {
         DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringLikerPack(andonEventCause.getEcCode(), "ecCode", result);
+        DdlPreparedPack.getStringLikerPack(andonEventCause.getEcName(), "ecName", result);
+
         getStringBuilderPack(andonEventCause, result);
 
         return result;
@@ -487,8 +508,29 @@ public class AndonHqlPack {
      */
     public static DdlPackBean packAndonPLC(AndonPLC plc) {
         DdlPackBean result = new DdlPackBean();
-        getStringBuilderPack(plc, result);
 
+        DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringLikerPack(plc.getTagAddress(),"tagAddress",result);
+        DdlPreparedPack.getStringLikerPack(plc.getTagName(),"tagName",result);
+
+        getStringBuilderPack(plc, result);
         return result;
     }
+
+    /**
+     * 检查安灯记录是否以存在
+     * @param andonManageRecord
+     * @return
+     */
+    public static DdlPackBean packHqlAndonManageRecordIsExist(AndonManageRecord andonManageRecord){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getAndonOrderNo(),"andonOrderNo", result);
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getStatusCode(),"statusCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getAlarmCode(),"alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getActionCode(),"actionCode", result);
+
+        getStringBuilderPack(andonManageRecord, result);
+        return  result;
+    }
 }

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

@@ -242,25 +242,31 @@ public class AndonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_TYPE {
-        PART("PART_ALARM","物料"),
-        QUALITY("QUALITY_ALARM","质量"),
-        EQUIP("EQUMENT_ALARM","设备"),
-        PROCESS("ROUTING_ALARM","工艺"),
-        CHECK("OTHER_ALARM","其他"),
-        FIX_ERROR("FIX_ERROR", "自动报警");
+        PART("PART_ALARM", 111020005, "物料"),
+        QUALITY("QUALITY_ALARM", 111020006, "质量"),
+        EQUIP("EQUMENT_ALARM", 111020007, "设备"),
+        PROCESS("ROUTING_ALARM", 111020008, "工艺"),
+        CHECK("OTHER_ALARM", 111020009, "其他"),
+        FIX_ERROR("FIX_ERROR", 111020010, "自动报警");
 
         private String value;
+        private Integer code;
         private String description;
 
-        ALARM_TYPE(String value, String description) {
+        ALARM_TYPE(String value, Integer code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
-        public String getValue() {
+         public String getValue() {
             return value;
         }
 
+        public Integer getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }