diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java index d329bba..455c6be 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ b/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; + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java index 0b2bdb3..dd2c7da 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java +++ b/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; + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java new file mode 100644 index 0000000..ad0541e --- /dev/null +++ b/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; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java index 603ff15..7343feb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java +++ b/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; + } }