diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java index 1c9c4b8d2..015d53e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java @@ -31,7 +31,6 @@ public class MesDataObject extends BaseBean { @ApiParam("对象代码") private String objectCode; - @Column(name = "OBJECT_NAME") @ApiParam("对象名称") private String objectName; @@ -43,4 +42,28 @@ public class MesDataObject extends BaseBean { @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; + + @Column(name = "FIELD_PK") + @ApiParam("主键") + private String fieldPk; + + @Column(name = "READ_FLAG_VALUE") + @ApiParam("读取标志值") + private String readFlagValue; + + @Column(name = "FEED_FIELD") + @ApiParam("反馈字段") + private String feedField; + + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + + @Column(name = "SELF_ADDITION") + @ApiParam("自增列") + private String selfAddition; + + @Column(name = "SELF_ADDITION_VALUE") + @ApiParam("自增列值") + private Long selfAdditionValue; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java index c9f59b0..645c2d5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java @@ -27,7 +27,6 @@ import javax.persistence.Table; @Api("对象结构") public class MesObjectCfg extends BaseBean { - @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; @@ -48,18 +47,6 @@ public class MesObjectCfg extends BaseBean { @ApiParam("列长度") private String fieldLength; - @Column(name = "FIELD_PK") - @ApiParam("主键标记") - private String fieldPk; - - @Column(name = "FEED_FIELD") - @ApiParam("反馈字段") - private String feedField; - - @Column(name = "FEED_VALUE") - @ApiParam("反馈值") - private String feedValue; - @Column(name = "POJO_ATTR") @ApiParam("对应的pojo属性") private String pojoAttr; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java index c788f8a..debf5a3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java @@ -43,4 +43,28 @@ public class MesDataObject extends BaseBean { @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; + + @Column(name = "FIELD_PK") + @ApiParam("主键") + private String fieldPk; + + @Column(name = "READ_FLAG_VALUE") + @ApiParam("读取标志值") + private String readFlagValue; + + @Column(name = "FEED_FIELD") + @ApiParam("反馈字段") + private String feedField; + + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + + @Column(name = "SELF_ADDITION") + @ApiParam("自增列") + private String selfAddition; + + @Column(name = "SELF_ADDITION_VALUE") + @ApiParam("自增列值") + private Long selfAdditionValue; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index e616922..b294abe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -27,7 +27,6 @@ import javax.persistence.Table; @Api("对象结构") public class MesObjectCfg extends BaseBean { - @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; @@ -48,19 +47,6 @@ public class MesObjectCfg extends BaseBean { @ApiParam("列长度") private String fieldLength; - @Column(name = "FIELD_PK") - @ApiParam("主键标记") - private String fieldPk; - - @Column(name = "FEED_FIELD") - @ApiParam("反馈字段") - private String feedField; - - @Column(name = "FEED_VALUE") - @ApiParam("反馈值") - private String feedValue; - - @Column(name = "POJO_ATTR") @ApiParam("对应的pojo属性") private String pojoAttr;