Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -4022,9 +4022,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MONITOR_TASK_OBJECT_TYPE {
 
-        PLC(10, "PLC"),
-        DB(20, "DB"),
-        OTHER(30, "其他");
+        PLC(10, "PLC");
+//        DB(20, "DB");
 
         private int value;
         private String description;

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

@@ -2660,9 +2660,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MONITOR_TASK_OBJECT_TYPE {
 
-        PLC(10, "PLC"),
-        DB(20, "DB"),
-        OTHER(30, "其他");
+        PLC(10, "PLC");
+//        DB(20, "DB");
 
         private int value;
         private String description;

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

@@ -89,6 +89,9 @@ public class MesPlcModel implements Serializable {
     @ApiParam("驱动")
     private String device;
 
+    @ApiParam("对象代码")
+    private String objectCode;
+
     public MesPlcModel() {
 
     }
@@ -96,7 +99,7 @@ public class MesPlcModel implements Serializable {
     public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
                        String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel,
                        String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName,
-                       String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device) {
+                       String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -122,5 +125,6 @@ public class MesPlcModel implements Serializable {
         this.analysisRule = analysisRule;
         this.isAnalysis = isAnalysis;
         this.device = device;
+        this.objectCode = objectCode;
     }
 }