#1050 工位监控

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

@@ -905,7 +905,8 @@ public class MesEnumUtil {
         STEP_CONTENT("stepContent", "工步内容"),
         MODULE_CONTENT("moduleContent", "组件内容"),
         CUSTOM_COMPONENT("customComponent", "定制内容"),
-        TASK_COMPLETE("taskComplete", "整个扫描完成");
+        TASK_COMPLETE("taskComplete", "整个扫描完成"),
+        RENEW_REQUEST_PARAMS("renewRequestParams","回传刷新StationResultBean");
 
         private String value;
         private String description;

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

@@ -1160,4 +1160,97 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * MesRoute 流程的类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_TYPE {
+
+        SCAN(10, "扫描流程"),
+        MONITOR(20, "监控流程");
+
+        private int value;
+        private String description;
+
+        ROUTE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(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 String valueOfDescription2(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * redis过期时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EXPIRE_TIME {
+
+        NEVER(-1, "不过期"),
+        ONE_HOUR(3600, "一小时"),
+        ONE_MIN(60, "一分钟");
+
+        private int value;
+        private String description;
+
+        EXPIRE_TIME(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(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 String valueOfDescription2(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -78,4 +78,8 @@ public class MesPlc extends BaseBean {
     @Column(name = "ENABLED")
     @ApiParam("是否启用 0 false 1 true")
     private Integer enabled;
+
+    @Column(name = "PLC_CFG")
+    @ApiParam("PLC的值的设定")
+    private String plcCfg;
 }

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

@@ -38,4 +38,8 @@ public class MesProdRouteCfg extends BaseBean {
     @Column(name = "ROUTE_CODE")
     @ApiParam("流程代码")
     private String routeCode;
+
+    @Column(name = "ROUTE_TYPE")
+    @ApiParam("流程类型 10-扫描类型 20-监控类型")
+    private Integer routeType;
 }

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

@@ -38,4 +38,9 @@ public class MesRoute extends BaseBean {
     @Column(name = "POSITION")
     @ApiParam("GOJS位置")
     private String position;
+
+
+    @Column(name = "ROUTE_TYPE")
+    @ApiParam("流程类型 10-扫描类型 20-监控类型")
+    private Integer routeType;
 }

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

@@ -21,14 +21,13 @@ public class PlcCacheKeyModel {
 
     private String tag;
 
-    public PlcCacheKeyModel(String channel, String device, String tag) {
+    public PlcCacheKeyModel( String device, String tag) {
-        this.channel = channel;
         this.device = device;
         this.tag = tag;
     }
 
     public String getPlcCacheKey() {
-        return channel + ":" + device + ":" + tag;
+        return device + ":" + tag;
     }
 
 

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.pcn.model;
 
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -57,4 +58,7 @@ public class StationRequestBean implements Serializable {
      */
     @ApiParam("业务类型")
     private String busiType;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcEquipment;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/28 12:04 PM
+ * @Description:
+ **/
+public interface MesWcEquipmentRepository extends BaseRepository<MesWcEquipment,Long> {
+}

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

@@ -38,4 +38,8 @@ public class MesProdRouteCfg extends BaseBean {
     @Column(name = "ROUTE_CODE")
     @ApiParam("流程代码")
     private String routeCode;
+
+    @Column(name = "ROUTE_TYPE")
+    @ApiParam("流程类型 10-扫描类型 20-监控类型")
+    private Integer routeType;
 }

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

@@ -38,4 +38,8 @@ public class MesRoute extends BaseBean {
     @Column(name = "POSITION")
     @ApiParam("GOJS位置")
     private String position;
+    
+    @Column(name = "ROUTE_TYPE")
+    @ApiParam("流程类型 10-扫描类型 20-监控类型")
+    private Integer routeType;
 }