Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/Produce.java

@@ -0,0 +1,79 @@
+package com.iamberry.rst.core.pts;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 产品类
+ * Created by wangxiaoming on 2017/8/25.
+ */
+public class Produce implements Serializable {
+
+    private static final long serialVersionUID = -4839873263890150738L;
+    private Integer  produceId;             //产品id
+    private String produceName;             //产品名称
+    private Integer produceStatus;          //产品状态
+    private String produceRemake;           //产品备注
+    private Date produceCreateTime;         //创建时间
+    private Date produceUpdateTime;         //修改时间
+
+    public Integer getProduceId() {
+        return produceId;
+    }
+
+    public void setProduceId(Integer produceId) {
+        this.produceId = produceId;
+    }
+
+    public String getProduceName() {
+        return produceName;
+    }
+
+    public void setProduceName(String produceName) {
+        this.produceName = produceName;
+    }
+
+    public Integer getProduceStatus() {
+        return produceStatus;
+    }
+
+    public void setProduceStatus(Integer produceStatus) {
+        this.produceStatus = produceStatus;
+    }
+
+    public String getProduceRemake() {
+        return produceRemake;
+    }
+
+    public void setProduceRemake(String produceRemake) {
+        this.produceRemake = produceRemake;
+    }
+
+    public Date getProduceCreateTime() {
+        return produceCreateTime;
+    }
+
+    public void setProduceCreateTime(Date produceCreateTime) {
+        this.produceCreateTime = produceCreateTime;
+    }
+
+    public Date getProduceUpdateTime() {
+        return produceUpdateTime;
+    }
+
+    public void setProduceUpdateTime(Date produceUpdateTime) {
+        this.produceUpdateTime = produceUpdateTime;
+    }
+
+    @Override
+    public String toString() {
+        return "Produce{" +
+                "produceId=" + produceId +
+                ", produceName='" + produceName + '\'' +
+                ", produceStatus=" + produceStatus +
+                ", produceRemake='" + produceRemake + '\'' +
+                ", produceCreateTime=" + produceCreateTime +
+                ", produceUpdateTime=" + produceUpdateTime +
+                '}';
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/ProduceProcess.java

@@ -0,0 +1,128 @@
+package com.iamberry.rst.core.pts;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 产品工序类
+ * Created by wangxiaoming on 2017/8/25.
+ */
+public class ProduceProcess implements Serializable {
+    private static final long serialVersionUID = -1772411181364755611L;
+    private Integer processId;              //工序id
+    private Integer produceId;              //生产产品id
+    private char processNo;                //工序编号
+    private String processName;            //工序名称
+    private Integer employeeId;            //员工id
+    private Integer driveId;                //设备id
+    private Integer processStatus;         //工序状态0：停止使用；1：正常使用；
+    private Integer processSort;           //工序排序
+    private String processRemake;          //工序备注
+    private Date processCreateTime;       //创建时间
+    private Date processUpdateTime;       //修改时间
+
+    public Integer getProcessId() {
+        return processId;
+    }
+
+    public void setProcessId(Integer processId) {
+        this.processId = processId;
+    }
+
+    public Integer getProduceId() {
+        return produceId;
+    }
+
+    public void setProduceId(Integer produceId) {
+        this.produceId = produceId;
+    }
+
+    public char getProcessNo() {
+        return processNo;
+    }
+
+    public void setProcessNo(char processNo) {
+        this.processNo = processNo;
+    }
+
+    public String getProcessName() {
+        return processName;
+    }
+
+    public void setProcessName(String processName) {
+        this.processName = processName;
+    }
+
+    public Integer getEmployeeId() {
+        return employeeId;
+    }
+
+    public void setEmployeeId(Integer employeeId) {
+        this.employeeId = employeeId;
+    }
+
+    public Integer getDriveId() {
+        return driveId;
+    }
+
+    public void setDriveId(Integer driveId) {
+        this.driveId = driveId;
+    }
+
+    public Integer getProcessStatus() {
+        return processStatus;
+    }
+
+    public void setProcessStatus(Integer processStatus) {
+        this.processStatus = processStatus;
+    }
+
+    public Integer getProcessSort() {
+        return processSort;
+    }
+
+    public void setProcessSort(Integer processSort) {
+        this.processSort = processSort;
+    }
+
+    public String getProcessRemake() {
+        return processRemake;
+    }
+
+    public void setProcessRemake(String processRemake) {
+        this.processRemake = processRemake;
+    }
+
+    public Date getProcessCreateTime() {
+        return processCreateTime;
+    }
+
+    public void setProcessCreateTime(Date processCreateTime) {
+        this.processCreateTime = processCreateTime;
+    }
+
+    public Date getProcessUpdateTime() {
+        return processUpdateTime;
+    }
+
+    public void setProcessUpdateTime(Date processUpdateTime) {
+        this.processUpdateTime = processUpdateTime;
+    }
+
+    @Override
+    public String toString() {
+        return "ProduceProcess{" +
+                "processId=" + processId +
+                ", produceId=" + produceId +
+                ", processNo=" + processNo +
+                ", processName='" + processName + '\'' +
+                ", employeeId=" + employeeId +
+                ", driveId=" + driveId +
+                ", processStatus=" + processStatus +
+                ", processSort=" + processSort +
+                ", processRemake='" + processRemake + '\'' +
+                ", processCreateTime=" + processCreateTime +
+                ", processUpdateTime=" + processUpdateTime +
+                '}';
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/processNode.java

@@ -0,0 +1,90 @@
+package com.iamberry.rst.core.pts;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 生产产品工序节点类
+ * Created by wangxiaoming on 2017/8/25.
+ *
+ */
+public class processNode implements Serializable {
+    private static final long serialVersionUID = -8907483062161665521L;
+    private Integer nodeId;             //节点id
+    private Integer produceId;          //产品id
+    private Integer processId;          //工序id
+    private Integer nodeNo;             //节点编号
+    private String nodeDes;             //节点备注
+    private Date nodeCreateTime;       //创建时间
+    private Date nodeUpdateTime;       //修改时间
+
+    public Integer getNodeId() {
+        return nodeId;
+    }
+
+    public void setNodeId(Integer nodeId) {
+        this.nodeId = nodeId;
+    }
+
+    public Integer getProduceId() {
+        return produceId;
+    }
+
+    public void setProduceId(Integer produceId) {
+        this.produceId = produceId;
+    }
+
+    public Integer getProcessId() {
+        return processId;
+    }
+
+    public void setProcessId(Integer processId) {
+        this.processId = processId;
+    }
+
+    public Integer getNodeNo() {
+        return nodeNo;
+    }
+
+    public void setNodeNo(Integer nodeNo) {
+        this.nodeNo = nodeNo;
+    }
+
+    public String getNodeDes() {
+        return nodeDes;
+    }
+
+    public void setNodeDes(String nodeDes) {
+        this.nodeDes = nodeDes;
+    }
+
+    public Date getNodeCreateTime() {
+        return nodeCreateTime;
+    }
+
+    public void setNodeCreateTime(Date nodeCreateTime) {
+        this.nodeCreateTime = nodeCreateTime;
+    }
+
+    public Date getNodeUpdateTime() {
+        return nodeUpdateTime;
+    }
+
+    public void setNodeUpdateTime(Date nodeUpdateTime) {
+        this.nodeUpdateTime = nodeUpdateTime;
+    }
+
+    @Override
+    public String toString() {
+        return "processNode{" +
+                "nodeId=" + nodeId +
+                ", produceId=" + produceId +
+                ", processId=" + processId +
+                ", nodeNo=" + nodeNo +
+                ", nodeDes='" + nodeDes + '\'' +
+                ", nodeCreateTime=" + nodeCreateTime +
+                ", nodeUpdateTime=" + nodeUpdateTime +
+                '}';
+    }
+}