添加工序类型，机器异常类型等字段，添加产品，工序，节点操作编号

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

@@ -14,7 +14,7 @@ public class ProcessNode implements Serializable {
     private Integer nodeId;             //节点id
     private Integer produceId;          //产品id
     private Integer processId;          //工序id
-    private Integer nodeNo;             //节点编号
+    private char nodeNo;             //节点编号
     private Integer nodeStatus;         //节点状态：0异常； 1正常；
     private String nodeDes;             //节点备注
     private Date nodeCreateTime;       //创建时间
@@ -44,11 +44,11 @@ public class ProcessNode implements Serializable {
         this.processId = processId;
     }
 
-    public Integer getNodeNo() {
+    public char getNodeNo() {
         return nodeNo;
     }
 
-    public void setNodeNo(Integer nodeNo) {
+    public void setNodeNo(char nodeNo) {
         this.nodeNo = nodeNo;
     }
 

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

@@ -12,6 +12,7 @@ public class Produce implements Serializable {
 
     private static final long serialVersionUID = -4839873263890150738L;
     private Integer  produceId;             //产品id
+    private char produceNo;                 //产品编号
     private String produceName;             //产品名称
     private Integer produceStatus;          //产品状态
     private String produceRemake;           //产品备注
@@ -86,6 +87,14 @@ public class Produce implements Serializable {
         this.employeeId = employeeId;
     }
 
+    public char getProduceNo() {
+        return produceNo;
+    }
+
+    public void setProduceNo(char produceNo) {
+        this.produceNo = produceNo;
+    }
+
     @Override
     public String toString() {
         return "Produce{" +

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

@@ -17,6 +17,7 @@ public class ProduceProcess implements Serializable {
     private Integer employeeId;            //员工id
     private Integer driveId;                //设备id
     private Integer processStatus;         //工序状态0：停止使用；1：正常使用；
+    private Integer processType;           //工序类型  1:生产工序  2:修理工序
     private Integer processSort;           //工序排序
     private String processRemake;          //工序备注
     private Date processCreateTime;       //创建时间
@@ -120,6 +121,14 @@ public class ProduceProcess implements Serializable {
         this.nodes = nodes;
     }
 
+    public Integer getProcessType() {
+        return processType;
+    }
+
+    public void setProcessType(Integer processType) {
+        this.processType = processType;
+    }
+
     @Override
     public String toString() {
         return "ProduceProcess{" +

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

@@ -21,6 +21,7 @@ public class PtsMachineLogs  implements Serializable {
     private String processName; //工序名称
     private String deviceName;  //设备名称
     private Integer logsProcessStatus; // 工序执行状态: 0异常   1正常
+    private Integer logsErrorType;      //异常类型  1:流程异常  2:次品异常
     private String logsProcessPrompt;  //工序异常状态提示
     private Date logsProcessTime; //工序执行时间
     private Date logsCreateTime; //创建时间
@@ -137,5 +138,11 @@ public class PtsMachineLogs  implements Serializable {
         this.logsCreateTime = logsCreateTime;
     }
 
+    public Integer getLogsErrorType() {
+        return logsErrorType;
+    }
 
+    public void setLogsErrorType(Integer logsErrorType) {
+        this.logsErrorType = logsErrorType;
+    }
 }