Jenkins自动合并

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

@@ -2732,4 +2732,74 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * MesMonitorTask实体对应的status值  监听任务状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MONITOR_TASK_STATUS {
+
+        NORMAL(10, "正常"),
+        CLOSE(20, "关闭");
+
+        private int value;
+        private String description;
+
+        MONITOR_TASK_STATUS(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;
+        }
+    }
+
+    /**
+     * 是否解析
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_IS_PARSE {
+        TRUE(1, "是"),
+        FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        PLC_IS_PARSE(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;
+        }
+    }
 }

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

@@ -37,7 +37,7 @@ public class MesMonitorTask extends BaseBean {
 
     @Column(name = "TASK_OBJECT_TYPE")
     @ApiParam("任务对象类型")
-    private String taskObjectType;
+    private Integer taskObjectType;
 
     @Column(name = "TASK_STATUS")
     @ApiParam("任务状态")

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

@@ -96,6 +96,10 @@ public class MesPlc extends BaseBean {
     @ApiParam("反馈值")
     private String feedValue;
 
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
     @Transient
     @ApiParam("设备名称")
     private String equipmentName;

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/1/10 0010 - 15:28
+ */
+@Data
+@Api("数据采集Model")
+public class DataAcquisitionModel {
+
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @ApiParam("字段代码")
+    private String fieldCode;
+
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @ApiParam("字段值")
+    private String fieldValue;
+//
+//    @ApiParam("组号")
+//    private String groupNo;
+
+}

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

@@ -37,7 +37,7 @@ public class MesMonitorTask extends BaseBean {
 
     @Column(name = "TASK_OBJECT_TYPE")
     @ApiParam("任务对象类型")
-    private String taskObjectType;
+    private Integer taskObjectType;
 
     @Column(name = "TASK_STATUS")
     @ApiParam("任务状态")

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

@@ -98,6 +98,10 @@ public class MesPlc extends BaseBean {
     @ApiParam("反馈值")
     private String feedValue;
 
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
     @Transient
     @ApiParam("设备名称")
     private String equipmentName;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2123,7 +2123,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringLikerPack(monitorTask.getTaskName(), "taskName", packBean);
         }
         if (!StringUtils.isEmpty(monitorTask.getTaskObjectType())) {
-            DdlPreparedPack.getStringEqualPack(monitorTask.getTaskObjectType(), "taskObjectType", packBean);
+            DdlPreparedPack.getNumEqualPack(monitorTask.getTaskObjectType(), "taskObjectType", packBean);
         }
         if (!StringUtils.isEmpty(monitorTask.getTaskStatus())) {
             DdlPreparedPack.getNumEqualPack(monitorTask.getTaskStatus(), "taskStatus", packBean);

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java

@@ -30,7 +30,7 @@ public class BasCustomer extends BaseBean {
 
     private static final long serialVersionUID = -1980207700343546396L;
     @Column(name = "CUST_NO")
-    @ApiParam(value = "客户编号")
+    @ApiParam(value = "客户编码")
     private String custNo;
 
     @Column(name = "CUST_NAME")
@@ -54,7 +54,7 @@ public class BasCustomer extends BaseBean {
     private String custEmail;
 
     @Column(name = "CUST_TEL")
-    @ApiParam(value = "联系人电话")
+    @ApiParam(value = "电话号码")
     private String custTel;
 
     @Column(name = "CUST_FAX")