优化POJO

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java

@@ -39,4 +39,8 @@ public class AndonAlarmCause extends BaseBean {
     @Column(name = "PARENT_AC_CODE")
     @ApiParam(value = "父阶原因代码")
     private String parentAcCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
 }

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java

@@ -39,4 +39,8 @@ public class AndonEventCause extends BaseBean {
     @Column(name = "PARENT_EC_CODE")
     @ApiParam(value = "父阶原因代码")
     private String parentEcCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
 }

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java

@@ -0,0 +1,46 @@
+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 17:16
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_EVENT_METHOD")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_事件处理方法")
+public class AndonEventMethod extends BaseBean {
+
+    @Column(name = "EM_CODE")
+    @ApiParam(value = "事件方法代码")
+    private String emCode;
+
+    @Column(name = "EM_NAME")
+    @ApiParam(value = "事件方法描述")
+    private String emName;
+
+    @Column(name = "PARENT_EM_CODE")
+    @ApiParam(value = "父阶方法代码")
+    private String parentEmCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+}

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

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.andon.sqlpack;
 
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause;
+import cn.estsh.i3plus.pojo.andon.bean.MesEquipment;
 import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell;
 import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
@@ -63,4 +65,33 @@ public class AndonHqlPack {
 
         return result;
     }
+
+    /**
+     * 按条件查询设备
+     * @param mesEquipment
+     * @return
+     */
+    public static DdlPackBean packHqlMesEquipment(MesEquipment mesEquipment){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCenterCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", result);
+        getStringBuilderPack(mesEquipment, result);
+
+        return result;
+    }
+
+    /**
+     * 按条件查询ANDON呼叫原因
+     * @param andonAlarmCause
+     * @return
+     */
+    public static DdlPackBean packHqlAndonAlarmCause(AndonAlarmCause andonAlarmCause){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
+        getStringBuilderPack(andonAlarmCause, result);
+
+        return result;
+    }
 }