安灯问题修复

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

@@ -34,5 +34,4 @@ public class AndonKnowledgeBase extends BaseManageQueue {
  @Column(name = "FLOW_MEMO")
  @ApiParam(value = "审批意见")
  private String flowMemo;
-
 }

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

@@ -67,7 +67,7 @@ public class AndonPLC extends BaseBean {
  @ApiParam(value = "分组号")
  private String groupNo;
 
-// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
+ @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
  @Column(name = "ALARM_CODE")
  @ApiParam(value = "安灯类型")
  private String alarmCode;
@@ -77,7 +77,7 @@ public class AndonPLC extends BaseBean {
  @ApiParam(value = "标签业务类型")
  private String tagBusinessType;
 
- @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
+ @AnnoOutputColumn(refClass = AndonEnumUtil.IS_ALARM_STATUS.class,refForeignKey = "value",value = "description")
  @Column(name = "IS_ALARM_STATUS")
  @ApiParam(value = "是否安灯")
  private Integer isAlarmStatus;

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.andon.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -11,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 安灯通知对象
@@ -39,4 +41,9 @@ public class AndonResponseObject extends BaseBean {
  @Column(name = "RP_OBJECT_VALUE")
  @ApiParam(value = "通知对象值")
  private String rpObjectValue;
+
+ @AnnoOutputColumn(hidden = true)
+ @Transient
+ @ApiParam(value = "通知对象")
+ private String rpObjectValueRdd;
 }

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

@@ -341,6 +341,23 @@ public class AndonHqlPack {
  * @param andonManageQueue
  * @return
  */
+ public static DdlPackBean packHqlAndonManageQueueUseByPlc(AndonManageQueue andonManageQueue, Object[] obj){
+ DdlPackBean result = new DdlPackBean();
+ DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", result);
+ DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result);
+ DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result);
+ DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result);
+ DdlPreparedPack.getInPackArray(obj, "statusCode", result);
+ DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
+ getStringBuilderPack(andonManageQueue, result);
+ return result;
+ }
+
+ /**
+ * 按条件查询按灯队列信息
+ * @param andonManageQueue
+ * @return
+ */
  public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue, Object[] obj){
  DdlPackBean result = new DdlPackBean();
  DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", result);

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

@@ -292,6 +292,58 @@ public class AndonEnumUtil {
  }
 
  /**
+ * 处理标识
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum IS_ALARM_STATUS {
+ TRUE(10, "是"), FALSE(20, "否");
+
+ private int value;
+ private String description;
+
+ private IS_ALARM_STATUS(int value, String description) {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public String getValueStr() {
+ return value + "";
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public static String valueOf(int val) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ tmp = values()[i].description;
+ }
+ }
+ return tmp;
+ }
+
+ public static int descOf(String desc) {
+ int tmp = 1;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].description.equals(desc)) {
+ tmp = values()[i].value;
+ }
+ }
+ return tmp;
+ }
+
+ public static String valueOfDescription(int val) {return valueOf(val);}
+ public static int descriptionOfValue(String desc) {return descOf(desc);}
+ }
+
+
+ /**
  * 按灯状态
  * 10-是，20-否
  */