代码审核 修改1

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

@@ -201,7 +201,7 @@ public class MesEnumUtil {
     }
 
     /**
-    * 设备台账报表查询标识
+     * 设备台账报表查询标识
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum EQUIPMENT_REPORT_TYPE {
@@ -2587,37 +2587,50 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CONFIG_TYPE {
 
-        FASTDFS_SAVE_PATH(10, "SAVE_PATH"),
-        NGINX_IP(20, "NGINX_HOST"),
-        MES_STATION_SOCKET(30, "mes_station_socket"),
-        GATEWAY_IP(40, "GATEWAY_HOST"),
-        UPDATE_SYNC_TIME(50, "UPDATE_SYNC_TIME"),
-        PCN_PULL(60, "PCN_PULL"),
-        PCN_PUSH(70, "PCN_PUSH"),
-        FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"),
-        REWORK_REPAIR(90, "REWORK_REPAIR");
+        FASTDFS_SAVE_PATH(10, "SAVE_PATH", ""),
+        NGINX_IP(20, "NGINX_HOST", ""),
+        MES_STATION_SOCKET(30, "MES_STATION_SOCKET", ""),
+        GATEWAY_IP(40, "GATEWAY_HOST", ""),
+        UPDATE_SYNC_TIME(50, "SYNC_DATA_URL", "UPDATE_SYNC_TIME"),
+        PCN_PULL(60, "SYNC_DATA_URL", "PCN_PULL"),
+        PCN_PUSH(70, "SYNC_DATA_URL", "PCN_PUSH"),
+        FDFS_DOWNLOAD(80, "SYNC_DATA_URL", "FDFS_DOWNLOAD"),
+        REWORK_REPAIR(90, "REWORK_REPAIR", ""),
+        OPC_LINK_SERVER_URL(100, "OPC_LINK", "OPC_LINK_SERVER_URL"),
+        OPC_LINK_USERNAME(110, "OPC_LINK", "OPC_LINK_USERNAME"),
+        OPC_LINK_PASSWORD(120, "OPC_LINK", "OPC_LINK_PASSWORD"),
+        OPC_LINK_REALM(130, "OPC_LINK", "OPC_LINK_REALM"),
+        OPC_LINK_CALLBACK(140, "OPC_LINK", "OPC_LINK_CALLBACK"),
+        SUPPLY_SWITCH(150,"SUPPLY_SWITCH","");
+
 
         private int value;
-        private String description;
+        private String code;
+        private String cfgKey;
 
-        CONFIG_TYPE(int value, String description) {
+        CONFIG_TYPE(int value, String code, String cfgKey) {
             this.value = value;
-            this.description = description;
+            this.code = code;
+            this.cfgKey = cfgKey;
         }
 
         public int getValue() {
             return value;
         }
 
-        public String getDescription() {
-            return description;
+        public String getCode() {
+            return code;
+        }
+
+        public String getCfgKey() {
+            return cfgKey;
         }
 
         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;
+                    tmp = values()[i].cfgKey;
                 }
             }
             return tmp;

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

@@ -92,6 +92,10 @@ public class MesPlc extends BaseBean {
     @ApiParam("是否解析")
     private String isAnalysis;
 
+    @Column(name = "FEED_VALUE")
+    @ApiParam("反馈值")
+    private String feedValue;
+
     @Transient
     @ApiParam("设备名称")
     private String equipmentName;

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

@@ -100,14 +100,14 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("客户条码")
     private String custSn;
 
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
     @Column(name = "CUST_PART_NO")
     @ApiParam("客户零件号")
     private String custPartNo;
 
-    @Column(name = "PACKAGE_SN")
-    @ApiParam("包装条码")
-    private String packageSn;
-
     @Column(name="OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;

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

@@ -94,6 +94,10 @@ public class MesPlc extends BaseBean {
     @ApiParam("是否解析")
     private String isAnalysis;
 
+    @Column(name = "FEED_VALUE")
+    @ApiParam("反馈值")
+    private String feedValue;
+
     @Transient
     @ApiParam("设备名称")
     private String equipmentName;

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

@@ -100,14 +100,14 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("客户条码")
     private String custSn;
 
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
     @Column(name = "CUST_PART_NO")
     @ApiParam("客户零件号")
     private String custPartNo;
 
-    @Column(name = "PACKAGE_SN")
-    @ApiParam("包装条码")
-    private String packageSn;
-
     @Column(name="OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;