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

6 years ago · ed9e388c8b
parent 1357dfad30 b668879f9d
commit ed9e388c8b
15 changed files with 73 additions and 33 deletions
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java
@ -42,7 +42,7 @@ public class MesConfig extends BaseBean {

    @Column(name = "CFG_KEY")
    @ApiParam("配置key")
-    private String cfgkey;
+    private String cfgKey;

    @Column(name = "CFG_VALUE")
    @ApiParam("配置value")
--- 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;
 }
--- 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;
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java
@ -27,6 +27,7 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PLC_CONFIGURE")
@Api("PLC设备信息配置表")
+@Deprecated
 public class MesPLCConfigure extends BaseBean {
    @Column(name = "IP")
    @ApiParam("设备ip")
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
@ -82,6 +82,9 @@ public class MesPackage extends BaseBean {
    @ApiParam("备注")
    private String memo;

+    public MesPackage() {
+    }
+
    public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) {
        this.packageNo = packageNo;
        this.partNo = partNo;
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java
@ -23,7 +23,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE")
+@Table(name = "MES_PACKAGE_DETAIL")
@Api("包装规格")
 public class MesPackageDetail extends BaseBean {

--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java
@ -28,7 +28,6 @@ import javax.persistence.Transient;
@Api("PLC配置表")
 public class MesPlc extends BaseBean {

-
    @Column(name = "PLC_CODE")
    @ApiParam("PLC代码")
    private String plcCode;
@ -65,6 +64,10 @@ public class MesPlc extends BaseBean {
    @ApiParam("分组名称")
    private String groupName;

+    @Column(name = "DEVICE")
+    @ApiParam("驱动")
+    private String device;
+
    @Column(name = "EQUIPMENT_CODE")
    @ApiParam("设备代码")
    private String equipmentCode;
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
@ -12,6 +12,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;

 /**
 * @Description:
@ -27,7 +28,9 @@ import javax.persistence.Transient;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_SN")
@Api("产品条码表")
-public class MesProduceSn extends BaseBean {
+public class MesProduceSn extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6641051790330191326L;

    @Column(name = "SERIAL_NUMBER")
    @ApiParam("产品条码")
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java
@ -42,7 +42,7 @@ public class MesConfig extends BaseBean {

    @Column(name = "CFG_KEY")
    @ApiParam("配置key")
-    private String cfgkey;
+    private String cfgKey;

    @Column(name = "CFG_VALUE")
    @ApiParam("配置value")
--- 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;
 }
--- 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;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java
@ -27,6 +27,7 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PLC_CONFIGURE")
@Api("PLC设备信息配置表")
+@Deprecated
 public class MesPLCConfigure extends BaseBean {
    @Column(name = "IP")
    @ApiParam("设备ip")
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
@ -66,6 +66,10 @@ public class MesPlc extends BaseBean {
    @ApiParam("分组名称")
    private String groupName;

+    @Column(name = "DEVICE")
+    @ApiParam("驱动")
+    private String device;
+
    @Column(name = "EQUIPMENT_CODE")
    @ApiParam("设备代码")
    private String equipmentCode;
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java
@ -18,6 +18,8 @@ import java.util.List;
@Data
 public class StationRequestBean implements Serializable {

+    private static final long serialVersionUID = -8597212451891803174L;
+
    @ApiParam("扫描信息")
    private String scanInfo;

--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java
@ -7,6 +7,9 @@ import java.io.Serializable;

@Data
 public class StepModel implements Serializable {
+
+    private static final long serialVersionUID = -5772746720347236465L;
+
    @ApiParam("工步代码")
    private String stepCode;