Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -126,6 +126,8 @@ public class AndonHqlPack {
     public static DdlPackBean packHqlAndonAlarmCause(AndonAlarmCause andonAlarmCause){
         DdlPackBean result = new DdlPackBean();
 
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcCode(),"acCode", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result);
         DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
         getStringBuilderPack(andonAlarmCause, result);
 
@@ -425,4 +427,33 @@ public class AndonHqlPack {
 
         return result;
     }
+
+    /**
+     * ANDON通知方式查询条件封装
+     * @param andonResponse
+     * @return
+     */
+    public static DdlPackBean packAndonResponse(AndonResponse andonResponse){
+        DdlPackBean result = new DdlPackBean();
+
+        getStringBuilderPack(andonResponse, result);
+
+        return result;
+    }
+
+    /**
+     * ANDON通知对象查询条件封装
+     * @param andonResponseObject
+     * @return
+     */
+    public static DdlPackBean packAndonResponseObject(AndonResponseObject andonResponseObject){
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectCode(), "rpObjectCode", result);
+        DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectName(), "rpObjectName", result);
+        DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectValue(), "rpObjectValue", result);
+
+        getStringBuilderPack(andonResponseObject, result);
+
+        return result;
+    }
 }

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

@@ -16,8 +16,8 @@ public class BlockFormEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FORM_TABLE_TYPE {
-        TABLE(1, "table", "表"),
-        VIEW(2, "view", "视图");
+        TABLE(1, "TABLE", "表"),
+        VIEW(2, "VIEW", "视图");
 
         private int value;
         private String code;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java

@@ -11,10 +11,7 @@ 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;
+import javax.persistence.*;
 import java.util.List;
 
 /**
@@ -49,9 +46,14 @@ public class BfElementPropertyVirtual extends BaseBean {
     private String propertyCode;
 
     @Column(name="PROPERTY_NAME")
-    @ApiParam(value ="虚拟属性名称")
+    @ApiParam(value ="显示名称")
     private String propertyName;
 
+    @Lob
+    @Column(name="PROPERTY_CODES")
+    @ApiParam(value ="属性代码")
+    private String propertyCodes;
+
     @Column(name="PROPERTY_TYPE")
     @ApiParam(value ="属性类型")
     private Integer propertyType;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java

@@ -87,4 +87,13 @@ public class MesQueueOrderDetail extends BaseBean {
     public int getStatusVal() {
         return this.status == null ? 0 : this.status;
     }
+
+    public MesQueueOrderDetail() {
+    }
+
+    public MesQueueOrderDetail(Double queueSeq, Double seq, String serialNumber) {
+        this.queueSeq = queueSeq;
+        this.seq = seq;
+        this.serialNumber = serialNumber;
+    }
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java

@@ -33,9 +33,17 @@ public class MesWorkCellPoint extends BaseBean {
 
     @Column(name = "QUEUE_SEQ")
     @ApiParam("队列主表序号")
-    private String queueSeq;
+    private Double queueSeq;
 
     @Column(name = "QUEUE_DETAIL_SEQ")
     @ApiParam("队列明细表序号")
-    private String queueDetailSeq;
+    private Double queueDetailSeq;
+
+    public double getQueueSeqVal() {
+        return this.queueSeq == null ? 0 : this.queueSeq;
+    }
+
+    public double getQueueDetailSeqVal() {
+        return this.queueDetailSeq == null ? 0 : this.queueDetailSeq;
+    }
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java

@@ -0,0 +1,71 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-06-03-11:44
+ * @Modify:
+ **/
+
+public class TorqueModel {
+    private Long id;
+
+    private Double upperLimit;
+
+    private Double lowerLimit;
+
+    private Double torqueValue;
+
+    private boolean ok;
+
+    private String color;
+
+    public boolean isOk() {
+        return ok;
+    }
+
+    public void setOk(boolean ok) {
+        this.ok = ok;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Double getUpperLimit() {
+        return upperLimit;
+    }
+
+    public void setUpperLimit(Double upperLimit) {
+        this.upperLimit = (upperLimit == null ? 0 : upperLimit);
+    }
+
+    public Double getLowerLimit() {
+        return lowerLimit;
+    }
+
+    public void setLowerLimit(Double lowerLimit) {
+        this.lowerLimit = (lowerLimit == null ? 0 : lowerLimit);
+    }
+
+    public Double getTorqueValue() {
+        return torqueValue;
+    }
+
+    public void setTorqueValue(Double torqueValue) {
+        this.torqueValue = (torqueValue == null ? 0 : torqueValue);
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java

@@ -37,9 +37,17 @@ public class MesWorkCellPoint extends BaseBean {
 
     @Column(name = "QUEUE_SEQ")
     @ApiParam("队列主表序号")
-    private String queueSeq;
+    private Double queueSeq;
 
     @Column(name = "QUEUE_DETAIL_SEQ")
     @ApiParam("队列明细表序号")
-    private String queueDetailSeq;
+    private Double queueDetailSeq;
+
+    public double getQueueSeqVal() {
+        return this.queueSeq == null ? 0 : this.queueSeq;
+    }
+
+    public double getQueueDetailSeqVal() {
+        return this.queueDetailSeq == null ? 0 : this.queueDetailSeq;
+    }
 }