合并代码 有代码丢失或者文件丢失请排查此处

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java

@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.annotation.Transient;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ACTION_MODULE")
+@EqualsAndHashCode(callSuper = true)
+@Api("作业组件")
+public class AndonActionModule extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8909733530761576575L;
+
+    @Column(name = "AM_CODE")
+    @ApiParam("组件代码")
+    private String amCode;
+
+    @Column(name = "AM_NAME")
+    @ApiParam("组件名称")
+    private String amName;
+
+    @Column(name = "AM_DESC")
+    @ApiParam("组件描述")
+    private String amDesc;
+
+    @Column(name = "CALL_CLASS")
+    @ApiParam("实现类")
+    private String callClass;
+
+    @Column(name = "AM_TYPE")
+    @ApiParam("组件类型")
+    private Integer amType;
+
+    @Column(name = "INTERFACE_NO")
+    @ApiParam("界面编号")
+    private String interfaceNo;
+
+    @Transient
+    @ApiParam("执行顺序")
+    private Integer seq;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ACTION_MODULE_GROUP")
+@EqualsAndHashCode(callSuper = true)
+@Api("组件集")
+public class AndonActionModuleGroup extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8905502301880084578L;
+
+    @Column(name = "AMG_ID")
+    @ApiParam("组件集编号")
+    private Long amgId;
+
+    @Column(name = "AM_CODE")
+    @ApiParam("组件代码")
+    private String amCode;
+
+    @Column(name = "SEQ")
+    @ApiParam("执行顺序")
+    private Integer seq;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ACTION_MODULE_PARAM")
+@EqualsAndHashCode(callSuper = true)
+@Api("组件参数")
+public class AndonActionModuleParam extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8216680446587969610L;
+
+    @Column(name = "AM_CODE")
+    @ApiParam("组件代码")
+    private String amCode;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_NAME")
+    @ApiParam("参数名称")
+    private String paramName;
+
+    @Column(name = "PARAM_TYPE")
+    @ApiParam("参数类型")
+    private String paramType;
+
+    @Column(name = "DEFAULT_VALUE")
+    @ApiParam("默认值")
+    private String defaultValue;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/05/08 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ACTION_ROUTE")
+@EqualsAndHashCode(callSuper = true)
+@Api("作业流程")
+public class AndonActionRoute extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 917593748015715793L;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "ROUTE_NAME")
+    @ApiParam("流程名称")
+    private String routeName;
+
+    @Column(name = "ROUTE_TYPE")
+    @ApiParam("流程类型")
+    private Integer routeType;
+
+    @Lob
+    @Column(name = "POSITION")
+    @ApiParam("GOJS位置")
+    private String position;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ACTOR")
+@EqualsAndHashCode(callSuper = true)
+@Api("ACTOR信息")
+public class AndonActor extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1472090790204808649L;
+
+    @Column(name = "ACTOR_CODE")
+    @ApiParam("actor代码")
+    private String actorCode;
+
+    @Column(name = "ACTOR_NAME")
+    @ApiParam("actor名称")
+    private String actorName;
+
+    @Column(name = "ACTOR_Class")
+    @ApiParam("actor名称")
+    private String actorClass;
+
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ACTOR_RULE")
+@EqualsAndHashCode(callSuper = true)
+@Api("ACTOR消息获取规则")
+public class AndonActorRule extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3244584643305867326L;
+
+    @Column(name = "ACTOR_CODE")
+    @ApiParam("actor代码")
+    private String actorCode;
+
+    @Column(name = "MT_CODE")
+    @ApiParam("消息类型代码")
+    private String mtCode;
+
+    @Column(name = "SPECIFIC_RULE")
+    @ApiParam("特定条件")
+    private String specificRule;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_呼叫原因
@@ -29,7 +30,9 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api(value = "ANDON_呼叫原因")
-public class AndonAlarmCause extends BaseBean {
+public class AndonAlarmCause extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 5837347497945981811L;
 
     @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     @Column(name = "ALARM_CODE")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : 安灯子类型
@@ -28,7 +29,9 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯子类型")
-public class AndonAlarmDetailType extends BaseBean {
+public class AndonAlarmDetailType extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1540491136291384925L;
 
     @Column(name = "ALARM_DETAIL_CODE")
     @ApiParam(value = "安灯子类型编码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_呼叫通知配置
@@ -28,7 +29,9 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_呼叫通知配置")
-public class AndonAlarmResponseCfg extends BaseBean {
+public class AndonAlarmResponseCfg extends BaseBean  implements Serializable {
+
+    private static final long serialVersionUID = 4302725908675374347L;
 
     @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     @Column(name = "ALARM_CODE")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ALARM_ROUTE")
+@EqualsAndHashCode(callSuper = true)
+@Api("安灯作业流程配置")
+public class AndonAlarmRoute extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -7425423934619147746L;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam("安灯类型代码")
+    private String alarmCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "ROUTE_TYPE")
+    @ApiParam("流程类型")
+    private Integer routeType;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java

@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ALARM_ROUTE_MODULE_PARAM")
+@EqualsAndHashCode(callSuper = true)
+@Api("安灯作业流程组件参数")
+public class AndonAlarmRouteModuleParam extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6659953988053255710L;
+
+    @Column(name = "ALARM_ROUTE_ID")
+    @ApiParam("安灯流程ID")
+    private Long alarmRouteId;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "AMG_ID")
+    @ApiParam("组件集编号")
+    private Long amgId;
+
+    @Column(name = "AM_CODE")
+    @ApiParam("组件代码")
+    private String amCode;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_VALUE")
+    @ApiParam("参数值")
+    private String paramValue;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ALARM_TYPE")
+@EqualsAndHashCode(callSuper = true)
+@Api("安灯类型")
+public class AndonAlarmType extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3286588436625932653L;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam("安灯类型代码")
+    private String alarmCode;
+
+    @Column(name = "ALARM_NAME")
+    @ApiParam("安灯类型名称")
+    private String alarmName;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :安灯广播
@@ -27,7 +28,10 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="ANDON_BROADCAST")
 @Api("安灯广播")
-public class AndonBroadCast extends BaseBean {
+public class AndonBroadCast extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -5383684820100076411L;
+
     @Column(name="DEVICE_NUM")
     @ApiParam("广播设备编号")
     private String targetIds;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -30,7 +31,10 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="ANDON_BROADCAST_CFG")
 @Api("生产区域")
-public class AndonBroadCastCfg extends BaseBean {
+public class AndonBroadCastCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 5434544329665544113L;
+
     @Column(name="ALARM_CODE")
     @ApiParam("安灯类型代码")
     private String alarmCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_工作单元呼叫原因配置
@@ -29,7 +30,10 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_工作单元呼叫原因配置")
-public class AndonCellAlarmCause extends BaseBean {
+public class AndonCellAlarmCause extends BaseBean  implements Serializable {
+
+    private static final long serialVersionUID = 3623997837738333774L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心代码")
     private String workCenterCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_工作单元事件原因配置
@@ -29,7 +30,9 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_工作单元事件原因配置")
-public class AndonCellEventCause extends BaseBean {
+public class AndonCellEventCause extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1641944472466007171L;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心代码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_工作单元处理方法配置
@@ -29,7 +30,10 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_工作单元处理方法配置")
-public class AndonCellEventMethod extends BaseBean {
+public class AndonCellEventMethod extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 8681966862823447650L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心代码")
     private String workCenterCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventPhenomenon.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_工作单元事件现象
@@ -26,7 +27,9 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_工作单元事件现象")
-public class AndonCellEventPhenomenon extends BaseBean {
+public class AndonCellEventPhenomenon extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4413846938406056923L;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心代码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_工位分组配置
@@ -29,7 +30,10 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_工位分组配置")
-public class AndonCellGroupCfg extends BaseBean {
+public class AndonCellGroupCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4801397986303698999L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心代码")
     private String workCenterCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : 系统参数配置
@@ -26,7 +27,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="ANDON_CONFIG")
 @Api(value="系统配置")
-public class AndonConfig extends BaseBean {
+public class AndonConfig extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3284234821448139251L;
 
     @Column(name="NAME")
     @ApiParam(value ="名称")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java

@@ -14,7 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
-import java.util.List;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_自处理配置
@@ -30,7 +30,9 @@ import java.util.List;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_自处理配置")
-public class AndonDisposalCfg extends BaseBean {
+public class AndonDisposalCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 161656982939855466L;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心代码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description: 自处理维护配置
@@ -29,7 +30,9 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("Andon自处理维护配置")
-public class AndonDisposalMaintenCfg extends BaseBean {
+public class AndonDisposalMaintenCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 474667557264134793L;
 
     @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     @Column(name = "ALARM_CODE")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_事件原因
@@ -29,7 +30,9 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api(value = "ANDON_事件原因")
-public class AndonEventCause extends BaseBean {
+public class AndonEventCause extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3051829000971794178L;
 
     @Column(name = "EC_CODE")
     @ApiParam(value = "事件原因代码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_事件处理方法
@@ -29,7 +30,9 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api(value = "ANDON_事件处理方法")
-public class AndonEventMethod extends BaseBean {
+public class AndonEventMethod extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 2079366249221906256L;
 
     @Column(name = "EM_CODE")
     @ApiParam(value = "事件方法代码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_事件现象
@@ -29,7 +30,9 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_事件现象")
-public class AndonEventPhenoMenon extends BaseBean {
+public class AndonEventPhenoMenon extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3844606172813258352L;
 
     @Column(name = "EPM_CODE")
     @ApiParam(value = "事件现象代码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : 安灯停线配置数据
@@ -34,7 +35,9 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯队列")
-public class AndonHaltCfg extends BaseBean {
+public class AndonHaltCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6209233767460121461L;
 
     @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     @Column(name = "ALARM_CODE")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_停机类型
@@ -26,7 +27,9 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON_停机类型")
-public class AndonHaltType extends BaseBean {
+public class AndonHaltType extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -7816748747119429173L;
 
     @Column(name = "HALT_CODE")
     @ApiParam(value = "停机类型编码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -26,7 +27,10 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("ANDON知识库")
-public class AndonKnowledgeBase extends BaseManageQueue {
+public class AndonKnowledgeBase extends BaseManageQueue implements Serializable {
+
+    private static final long serialVersionUID = -1636250887271456543L;
+
     @Column(name = "FLOW_STATUS")
     @ApiParam(value = "审批状态")
     private Integer flowStatus;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
@@ -41,7 +42,22 @@ import java.util.List;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯队列")
-public class AndonManageQueue extends BaseManageQueue {
+public class AndonManageQueue extends BaseManageQueue implements Serializable {
+
+    private static final long serialVersionUID = 183865984747203897L;
+
+    @Transient
+    @ApiParam(value ="触发事件")
+    private String triggerEvent;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam(value = "流程代码")
+    private String routeCode;
+
+    @Column(name = "ROUTE_STATUS_CODE")
+    @ApiParam(value = "状态点代码")
+    private String routeStatusCode;
+
     @Column(name = "SEQ")
     @ApiParam(value = "序号", example = "1")
     private Double seq;
@@ -283,9 +299,13 @@ public class AndonManageQueue extends BaseManageQueue {
     /**
      * 工位统计 构造函数
      * @param workCenterCode
+     * @param workCenterNameRdd
      * @param workCellCode
+     * @param workCellNameRdd
      * @param equipmentCode
+     * @param equipmentNameRdd
      * @param shiftCode
+     * @param shiftNameRdd
      * @param alarmCode
      * @param andonCount
      */
@@ -304,12 +324,14 @@ public class AndonManageQueue extends BaseManageQueue {
 
     /**
      * 原因统计 使用Java内存计算（获取原始数据）
+     * @param acCode
+     * @param acNameRdd
      * @param workCenterCode
      * @param workCenterNameRdd
      * @param workCellCode
      * @param workCellNameRdd
      * @param alarmCode
-     * @param ecCodec
+     * @param ecCode
      * @param ecNameRdd
      * @param emCode
      * @param emNameRdd
@@ -336,6 +358,10 @@ public class AndonManageQueue extends BaseManageQueue {
 
     /**
      * 人员统计 使用Java内存计算（获取原始数据）
+     * @param organizeCode
+     * @param workCenterNameRdd
+     * @param workCellCode
+     * @param workCellNameRdd
      * @param resetUser
      * @param alarmCode
      * @param callTime
@@ -356,6 +382,7 @@ public class AndonManageQueue extends BaseManageQueue {
 
     /**
      * 统计分析柏拉图 使用JAVA内存计算（获取原始数据）
+     * @param workCenterNameRdd
      * @param alarmCode
      * @param ecCode
      * @param ecNameRdd
@@ -401,4 +428,5 @@ public class AndonManageQueue extends BaseManageQueue {
             e.printStackTrace();
         }
     }
+
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 
 /**
  * @Description : 安灯记录
@@ -36,7 +37,17 @@ import javax.persistence.*;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯记录")
-public class AndonManageRecord extends BaseManageQueue {
+public class AndonManageRecord extends BaseManageQueue implements Serializable {
+
+    private static final long serialVersionUID = 4667499369694353351L;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam(value = "流程代码")
+    private String routeCode;
+
+    @Column(name = "ROUTE_STATUS_CODE")
+    @ApiParam(value = "状态点代码")
+    private String routeStatusCode;
 
     @Column(name = "SEQ")
     @ApiParam(value = "序号", example = "1")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description: 安灯通知记录表
@@ -29,7 +30,10 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("通知记录")
-public class AndonMessageRecord extends BaseBean {
+public class AndonMessageRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -5002185160195696080L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心")
     private String workCenterCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_MESSAGE_TYPE")
+@EqualsAndHashCode(callSuper = true)
+@Api("消息类型")
+public class AndonMessageType extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6140381522677959027L;
+
+    @Column(name = "MT_CODE")
+    @ApiParam("消息类型代码")
+    private String mtCode;
+
+    @Column(name = "MT_NAME")
+    @ApiParam("消息类型名称")
+    private String mtName;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java

@@ -15,6 +15,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_PLC控制
@@ -30,7 +31,9 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯PLC控制")
-public class AndonPLC extends BaseBean {
+public class AndonPLC extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -611094238158756163L;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java

@@ -12,6 +12,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : ANDON_PLC监控记录
@@ -34,7 +35,9 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯PLC监控记录")
-public class AndonPLCRecord extends BaseBean {
+public class AndonPLCRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1593292976397416635L;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心代码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description : 安灯任务附属表
@@ -26,7 +27,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="ANDON_MANAGE_ATTACH")
 @Api(value="安灯附属表")
-public class AndonQueueAttach extends BaseBean {
+public class AndonQueueAttach extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6314624948969141111L;
 
     @Column(name="PROD_INFO")
     @ApiParam(value ="产品信息" , example ="-1")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -28,7 +29,9 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("通知方式")
-public class AndonResponse extends BaseBean {
+public class AndonResponse extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3558849492798328348L;
 
     @Column(name = "RESPONSE_CODE")
     @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description : 安灯通知对象
@@ -28,7 +29,9 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯通知对象")
-public class AndonResponseObject extends BaseBean {
+public class AndonResponseObject extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 7623038823371770473L;
 
     @Column(name = "RP_OBJECT_CODE")
     @ApiParam(value = "通知对象对象编码")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "PTL_ROUTE_MODULE_PARAM")
+@EqualsAndHashCode(callSuper = true)
+@Api("流程组件参数")
+public class AndonRouteModuleParam extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -282175947799144290L;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "AMG_ID")
+    @ApiParam("组件集编号")
+    private Long amgId;
+
+    @Column(name = "AM_CODE")
+    @ApiParam("组件代码")
+    private String amCode;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_VALUE")
+    @ApiParam("参数值")
+    private String paramValue;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_ROUTE_STATUS")
+@EqualsAndHashCode(callSuper = true)
+@Api("流程状态")
+public class AndonRouteStatus extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 2091426896667989586L;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @Column(name = "STATUS_NAME")
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @Column(name = "NEXT_STATUS")
+    @ApiParam("下一状态")
+    private String nextStatus;
+
+    @Column(name = "TRIGGER_TYPE")
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
+    @Column(name = "TRIGGER_EVENT")
+    @ApiParam("触发事件")
+    private String triggerEvent;
+
+    @Column(name = "TRIGGER_WHERE")
+    @ApiParam("触发条件（MVEL）")
+    private String triggerWhere;
+
+    @Column(name = "ACTION_AMG_ID")
+    @ApiParam("触发调用")
+    private Long actionAmgId;
+
+    @Column(name = "IN_AMG_ID")
+    @ApiParam("进入状态调用")
+    private Long inAmgId;
+
+    @Column(name = "OUT_AMG_ID")
+    @ApiParam("离开状态调用")
+    private Long outAmgId;
+
+    @Column(name = "STATUS_TYPE")
+    @ApiParam("状态类型")
+    private Integer statusType;
+
+    @Transient
+    @ApiParam("默认不缓存")
+    private boolean cacheFlag = false;
+
+    @Transient
+    @ApiParam("触发组件集默认未执行")
+    private boolean actionAmgIdFalg = false;
+
+    @Transient
+    @ApiParam("触发组件集默认未执行")
+    private boolean checkTriggerTypeFalg = false;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java

@@ -16,6 +16,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -32,7 +33,10 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="MES_AREA")
 @Api("生产区域")
-public class MesArea extends BaseBean {
+public class MesArea extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6011431901401687892L;
+
     @Column(name="AREA_CODE")
     @ApiParam("区域代码")
     private String areaCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java

@@ -17,6 +17,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description :生产设备
@@ -32,7 +33,10 @@ import javax.persistence.Transient;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="MES_EQUIPMENT")
 @Api("生产设备")
-public class MesEquipment extends BaseBean {
+public class MesEquipment extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -4827453020382814751L;
+
     @Column(name="EQUIPMENT_CODE")
     @ApiParam("设备代码")
     private String equipmentCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :mes系统业务动作
@@ -27,7 +28,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="MES_SHIFT")
 @Api("班次信息")
-public class MesShift extends BaseBean {
+public class MesShift extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -459263592129978101L;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java

@@ -15,6 +15,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -31,7 +32,10 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_WORK_CELL")
 @Api("工作单元")
-public class MesWorkCell extends BaseBean {
+public class MesWorkCell extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -5981041286446162921L;
+
     @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java

@@ -15,6 +15,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -31,7 +32,10 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_WORK_CENTER")
 @Api("工作中心")
-public class MesWorkCenter extends BaseBean {
+public class MesWorkCenter extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1988041859547182829L;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心代码")
     private String workCenterCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ActionModuleModel.java

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 18:18
+ * @desc
+ */
+@Data
+@ApiModel("作业组件model")
+public class ActionModuleModel {
+
+    @ApiModelProperty("组件代码")
+    private String amCode;
+
+    @ApiModelProperty("调用类")
+    private String callClass;
+
+    @ApiModelProperty("是否完成")
+    private Boolean isComplete;
+
+    @ApiModelProperty("执行顺序")
+    private Integer seq;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java

@@ -13,7 +13,9 @@ import java.io.Serializable;
  * @Modify:
  **/
 @Data
-public class AndonBoardModel {
+public class AndonBoardModel implements Serializable {
+
+    private static final long serialVersionUID = 4995310176494124290L;
 
     @ApiParam("工作单元代码")
     private String workCellCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -16,7 +17,9 @@ import java.util.List;
  * @Modify:
  **/
 @Data
-public class AndonMenuInterfaceModel{
+public class AndonMenuInterfaceModel implements Serializable {
+
+    private static final long serialVersionUID = 6854130571481363067L;
 
     @ApiParam("工作中心代码")
     private String  workCenterCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java

@@ -0,0 +1,84 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@ApiModel("状态点model")
+public class AndonRouteStatusModel implements Serializable {
+
+    private static final long serialVersionUID = -6258870691272170423L;
+
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @ApiParam("下一状态")
+    private String nextStatus;
+
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
+    @ApiParam("触发事件")
+    private String triggerEvent;
+
+    @ApiParam("触发条件（MVEL）")
+    private String triggerWhere;
+
+    @ApiParam("触发调用")
+    private Long actionAmgId;
+
+    @ApiParam("进入状态调用")
+    private Long inAmgId;
+
+    @ApiParam("离开状态调用")
+    private Long outAmgId;
+
+    @ApiParam("状态类型")
+    private Integer statusType;
+
+    @ApiParam("安灯类型代码")
+    private String alarmCode;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("流程类型")
+    private Integer routeType;
+
+    public AndonRouteStatusModel() {
+    }
+
+    public AndonRouteStatusModel(String routeCode, String statusCode, String statusName, String nextStatus, Integer triggerType,
+                                 String triggerEvent, String triggerWhere, Long actionAmgId, Long inAmgId, Long outAmgId,
+                                 Integer statusType, String alarmCode, String workCenterCode, Integer routeType) {
+        this.routeCode = routeCode;
+        this.statusCode = statusCode;
+        this.statusName = statusName;
+        this.nextStatus = nextStatus;
+        this.triggerType = triggerType;
+        this.triggerEvent = triggerEvent;
+        this.triggerWhere = triggerWhere;
+        this.actionAmgId = actionAmgId;
+        this.inAmgId = inAmgId;
+        this.outAmgId = outAmgId;
+        this.statusType = statusType;
+        this.alarmCode = alarmCode;
+        this.workCenterCode = workCenterCode;
+        this.routeType = routeType;
+    }
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java

@@ -9,6 +9,7 @@ import lombok.Data;
 
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -19,7 +20,9 @@ import javax.persistence.MappedSuperclass;
  **/
 @Data
 @MappedSuperclass
-public class BaseManageQueue extends BaseBean {
+public class BaseManageQueue extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 5223610541891941843L;
 
     @Column(name = "ANDON_ORDER_NO")
     @ApiParam(value = "安灯队列编号")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java

@@ -12,13 +12,16 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import javax.persistence.Column;
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * 工位分组配置model
  */
 @Data
-public class CellGroupStatusModel{
+public class CellGroupStatusModel implements Serializable {
+
+    private static final long serialVersionUID = -6614881484056090725L;
 
     @ApiParam("工作中心代码")
     private String  workCenterCode;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonRouteStatus;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@ApiModel("通用数据传输对象")
+public class CommonMsgModel implements Serializable {
+
+    private static final long serialVersionUID = -1772176070851992335L;
+
+    @ApiModelProperty("工厂")
+    private String organizeCode;
+
+    @ApiModelProperty("用户信息")
+    private String userInfo;
+
+    @ApiModelProperty("消息类型")
+    private String msgType;
+
+    @ApiModelProperty("消息数据")
+    private Map<String, Object> msgData;
+
+    @ApiModelProperty("流程状态集合")
+    private List<AndonRouteStatus> routeStatusList;
+
+    @ApiModelProperty("当前流程状态")
+    private AndonRouteStatus curRouteStatus;
+
+    @ApiModelProperty("外部触发事件")
+    private String triggerEvent;
+
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java

@@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Entity;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -23,7 +24,9 @@ import javax.persistence.Entity;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("组织模型")
-public class ProdOrgModel extends BaseBean {
+public class ProdOrgModel extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 2210888838877951435L;
 
     @ApiParam("区域名称")
     private String areaName;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java

@@ -4,9 +4,12 @@ import cn.estsh.i3plus.pojo.andon.bean.MesArea;
 import io.swagger.annotations.ApiParam;
 
 import javax.persistence.Transient;
+import java.io.Serializable;
 import java.util.List;
 
-public class SysOrganizeModel{
+public class SysOrganizeModel implements Serializable {
+
+    private static final long serialVersionUID = -8218859255737680832L;
 
     @Transient
     @ApiParam(value ="父节点")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonActor;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : actor
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:13
+ * @Modify:
+ **/
+@Repository
+public interface IAndonActorRepository extends BaseRepository<AndonActor, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActorRuleRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonActorRule;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : actor rule
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:13
+ * @Modify:
+ **/
+@Repository
+public interface IAndonActorRuleRepository extends BaseRepository<AndonActorRule, Long> {
+}

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -31,6 +31,8 @@ import java.io.Serializable;
 //@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换
 public abstract class BaseBean implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     //此处使用hibernate的主键策略方式
     //手动设置,使用iplus-platform-common中的idtool生成
     //将Long类型系列化成String避免精度丢失
@@ -141,6 +143,14 @@ public abstract class BaseBean implements Serializable {
     //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
     public transient Integer ascOrDesc = 1;
 
+    public int getIsValidVal() {
+        return this.isValid == null ? 0 : this.isValid.intValue();
+    }
+
+    public int getIsDeletedVal() {
+        return this.isDeleted == null ? 0 : this.isDeleted.intValue();
+    }
+
     //排序方式
     public String orderBy(){
         String result = "";

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java

@@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 
 import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @Description : hql脚本封装类
@@ -63,7 +62,23 @@ public class DdlPackBean {
 
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
-        DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result);
+        DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
+
+        return result;
+    }
+
+    /**
+     * 查询指定组织、指定是否有效的数据
+     * @param organizeCode
+     * @param isValid
+     * @return
+     */
+    public static DdlPackBean getDdlPackBean(String organizeCode, int isValid){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
+        DdlPreparedPack.getNumEqualPack(isValid,"isValid",result);
+        DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
 
         return result;
     }

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

@@ -13,6 +13,100 @@ import org.apache.commons.lang3.StringUtils;
 public class AndonEnumUtil {
 
     /**
+     * 流程状态-触发类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_TRIGGER_TYPE {
+        INNER_TRIGGER(10, "内部触发"),
+        OUTER_TRIGGER(20, "外部触发");
+
+        private int value;
+        private String description;
+
+        ROUTE_TRIGGER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 组件状态类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_STATUS_TYPE {
+        START(10, "START", "开始状态"),
+        EXECUTING(20, "EXECUTING", "执行中状态"),
+        TERMINATE(30, "TERMINATE", "中断状态"),
+        FINISH(40, "FINISH", "完成状态");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ROUTE_STATUS_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 安灯作业组件-组件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTION_MODULE_AM_TYPE {
+
+        METHOD_MODULE(10, "方法组件"),
+        INTERFACE_MODULE(20, "界面组件");
+
+        private int value;
+        private String description;
+
+        ACTION_MODULE_AM_TYPE(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;
+        }
+    }
+
+    /**
      * 安灯主界面产线或者站点运行状态
      * 正常 = 10，故障 = 20
      */
@@ -766,6 +860,15 @@ public class AndonEnumUtil {
             return description;
         }
 
+        public static ANDON_ACTION_TAG getByValue(int value) {
+            for (ANDON_ACTION_TAG actionTag : values()) {
+                if (actionTag.getValue() == value) {
+                    return actionTag;
+                }
+            }
+            return null;
+        }
+
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -924,6 +1027,15 @@ public class AndonEnumUtil {
             return description;
         }
 
+        public static ALARM_SOURCE_TYPE getByValue(String value) {
+            for (ALARM_SOURCE_TYPE sourceType : values()) {
+                if (sourceType.getValue().equals(value)) {
+                    return sourceType;
+                }
+            }
+            return null;
+        }
+
         public static String valueOfDescription(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {

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

@@ -2320,6 +2320,16 @@ public class CommonEnumUtil {
             return tmp;
         }
 
+        public static int descriptionOfValue(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
         public static FIELD_TYPE codeOf(Integer value) {
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == value) {
@@ -2433,7 +2443,7 @@ public class CommonEnumUtil {
             return tmp;
         }
 
-        public static Integer valueOfDescription(String desc) {
+        public static Integer descriptionOfValue(String desc) {
             Integer tmp = 1;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].description.equals(desc)) {
@@ -2499,7 +2509,7 @@ public class CommonEnumUtil {
         }
 
 
-        public static Integer valueOfDescription(String desc) {
+        public static Integer descriptionOfValue(String desc) {
             Integer tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].description.equals(desc)) {

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

@@ -16,12 +16,11 @@ public class ImppEnumUtil {
      * 1.集团，2.公司，3.工厂
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum ORGANIZE_YTPE{
+    public enum ORGANIZE_YTPE {
 
-        TYPE_GROUP(1,"集团","集团"),
-        TYPE_COMPANY(2,"公司","公司"),
-        TYPE_FACTORY(3,"工厂","工厂"),
-        ;
+        TYPE_GROUP(1, "集团", "集团"),
+        TYPE_COMPANY(2, "公司", "公司"),
+        TYPE_FACTORY(3, "工厂", "工厂");
 
         private int value;
         private String name;
@@ -86,8 +85,8 @@ public class ImppEnumUtil {
      * 3.权限CODE
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum TASK_METHOD_TYPE{
-        CLASS_METHOD(1,"类方法","Java Class 方法");
+    public enum TASK_METHOD_TYPE {
+        CLASS_METHOD(1, "类方法", "Java Class 方法");
 //        TYPE_COMPANY(2,"链接","Http URL"),
 //        TYPE_FACTORY(3,"权限CODE","权限CODE");
 
@@ -148,7 +147,7 @@ public class ImppEnumUtil {
     }
 
     /**
-     *  日志级别
+     * 日志级别
      * 1.DEBUG：调试程序信息，
      * 2.INFO：程序运行信息，
      * 3.WARN：具有潜在危害的信息，
@@ -156,13 +155,13 @@ public class ImppEnumUtil {
      * 5.FATAL：非常严重的错误，可能导致程序中止
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum LOG_LEVEL{
+    public enum LOG_LEVEL {
 
-        DEBUG(1,"DEBUG","调试"),
-        INFO(2,"INFO","信息"),
-        WARN(3,"WARN","注意"),
-        ERROR(4,"ERROR","错误"),
-        FATAL(5,"FATAL","严重");
+        DEBUG(1, "DEBUG", "调试"),
+        INFO(2, "INFO", "信息"),
+        WARN(3, "WARN", "注意"),
+        ERROR(4, "ERROR", "错误"),
+        FATAL(5, "FATAL", "严重");
 
         private int value;
         private String name;
@@ -238,13 +237,13 @@ public class ImppEnumUtil {
      * 4.SELECT：查询
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum OPERATE_TYPE{
+    public enum OPERATE_TYPE {
 
-        INSERT(1,"post","新增"),    //POST
-        DELETE(2,"put","修改"),    //PUT
-        UPDATE(3,"delete","删除"),    //DELETE
-        SELECT(4,"get","查询"),    //GET
-        BUSI(5,"busi","处理");
+        INSERT(1, "post", "新增"),    //POST
+        DELETE(2, "put", "修改"),    //PUT
+        UPDATE(3, "delete", "删除"),    //DELETE
+        SELECT(4, "get", "查询"),    //GET
+        BUSI(5, "busi", "处理");
 
         private int value;
         private String name;
@@ -317,9 +316,9 @@ public class ImppEnumUtil {
      * 1.PC：个人计算机
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum OPERATE_TERMINAL{
+    public enum OPERATE_TERMINAL {
 
-        PC(1,"电脑端"),PDA(2,"PDA"),MOBILE(3,"手机");
+        PC(1, "电脑端"), PDA(2, "PDA"), MOBILE(3, "手机");
 
         private int value;
         private String description;
@@ -360,8 +359,8 @@ public class ImppEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MESSAGE_STATUS {
 
-        READ(1,"已读","fa cell-fa fa-file-text"),
-        UNREAD(2,"未读","fa cell-fa fa-file-o");
+        READ(1, "已读", "fa cell-fa fa-file-text"),
+        UNREAD(2, "未读", "fa cell-fa fa-file-o");
 
         private int value;
         private String name;
@@ -428,10 +427,10 @@ public class ImppEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MESSAGE_TYPE {
 
-        MAIL(1,"邮件","邮件"),
-        LETTER(2,"站内信","站内信"),
-        SWEB_NOTICE(3,"SWEB通知","SWEB通知"),
-        SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告");
+        MAIL(1, "邮件", "邮件"),
+        LETTER(2, "站内信", "站内信"),
+        SWEB_NOTICE(3, "SWEB通知", "SWEB通知"),
+        SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告");
 
         private int value;
         private String name;
@@ -498,13 +497,13 @@ public class ImppEnumUtil {
      * 5.MIDDLE_TABLE：中间表
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum TOOL_CONN_TYPE{
+    public enum TOOL_CONN_TYPE {
 
-        SERIAL_PORT(1,"串口","串口"),
-        NETWORK_PORT(2,"网口","网口"),
-        OPC(3,"OPC","OPC"),
-        USB(4,"USB","USB"),
-        MIDDLE_TABLE(5,"中间表","中间表");
+        SERIAL_PORT(1, "串口", "串口"),
+        NETWORK_PORT(2, "网口", "网口"),
+        OPC(3, "OPC", "OPC"),
+        USB(4, "USB", "USB"),
+        MIDDLE_TABLE(5, "中间表", "中间表");
         private int value;
         private String name;
         private String description;
@@ -568,11 +567,11 @@ public class ImppEnumUtil {
      * 3.BINARY_PACKET：二进制数据包
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum TOOL_DATA_TYPE{
+    public enum TOOL_DATA_TYPE {
 
-        STRING(1,"字符串","字符串"),
-        TABLE(2,"数据表","数据表"),
-        BINARY_PACKET(3,"二进制数据包","二进制数据包");
+        STRING(1, "字符串", "字符串"),
+        TABLE(2, "数据表", "数据表"),
+        BINARY_PACKET(3, "二进制数据包", "二进制数据包");
 
         private int value;
         private String name;
@@ -635,9 +634,9 @@ public class ImppEnumUtil {
      * 1.SYSTEM：系统参数
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum SYS_CONFIG_TYPE{
+    public enum SYS_CONFIG_TYPE {
 
-        SYSTEM(1,"系统参数","系统参数");
+        SYSTEM(1, "系统参数", "系统参数");
 
         private int value;
         private String name;
@@ -702,8 +701,8 @@ public class ImppEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MESSAGE_TYPE_CONTENT {
 
-        HTML(1,"HTML","text/html;charset=UTF-8"),
-        TEXT(2,"TEXT","text/plain;charset=UTF-8");
+        HTML(1, "HTML", "text/html;charset=UTF-8"),
+        TEXT(2, "TEXT", "text/plain;charset=UTF-8");
 
         private int value;
         private String name;
@@ -770,9 +769,9 @@ public class ImppEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DYN_TABLE_CELL_TYPE {
 
-        STRING(1,"String","字符串类型"),
-        NUMBER(2,"Number","数字类型"),
-        DATE(3,"Date","时间类型");
+        STRING(1, "String", "字符串类型"),
+        NUMBER(2, "Number", "数字类型"),
+        DATE(3, "Date", "时间类型");
 
         private int value;
         private String name;
@@ -829,6 +828,7 @@ public class ImppEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 系统值类型
      * 1. String
@@ -838,12 +838,12 @@ public class ImppEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SYS_VALUE_TYPE {
 
-        STRING(1,"text","文本"),
-        NUMBER(2,"number","数字"),
-        DATE(3,"date","时间"),
-        SWITCH(4,"switch","布尔"),
-        SELECT(5,"select","选择"),
-        FILE(6,"select","选择");
+        STRING(1, "text", "文本"),
+        NUMBER(2, "number", "数字"),
+        DATE(3, "date", "时间"),
+        SWITCH(4, "switch", "布尔"),
+        SELECT(5, "select", "选择"),
+        FILE(6, "select", "选择");
 
         private int value;
         private String name;
@@ -910,7 +910,7 @@ public class ImppEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SYS_CACHE_TYPE {
 
-        REDIS(1,"Redis","Redis 缓存方式");
+        REDIS(1, "Redis", "Redis 缓存方式");
 
         private int value;
         private String name;
@@ -1054,6 +1054,7 @@ public class ImppEnumUtil {
         }
     }
 
+
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MESSAGE_RECEIVER_TYPE {
         INTERNAL(1, "内部人员"),
@@ -1095,10 +1096,10 @@ public class ImppEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FILE_ATTACH_SOURCE {
-        MAIL(1,"邮件","邮件"),
-        LETTER(2,"站内信","站内信"),
-        SWEB_NOTICE(3,"SWEB通知","SWEB通知"),
-        SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告");
+        MAIL(1, "邮件", "邮件"),
+        LETTER(2, "站内信", "站内信"),
+        SWEB_NOTICE(3, "SWEB通知", "SWEB通知"),
+        SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告");
 
         private int value;
         private String name;

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

@@ -2564,12 +2564,11 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_QC_CHECK_TYPE {
-
-        IN_MATERIAL_CHECK(5, "IN_MATERIAL_CHECK", "来料检验"),
+        INCOMING_CHECK(5, "INCOMING_CHECK", "来料检验"),
         FIRST_CHECK(10, "FIRST_CHECK", "首检"),
         ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"),
-        END_CHECK(30, "END_CHECK", "尾检"),
-        EDELIVERY_CHECK(40, "EDELIVERY_CHECK", "发货");
+        END_CHECK(30, "END_CHECK", "末检"),
+        RC_CHECK(40, "RC_CHECK", "发货检验");
 
         private int value;
         private String code;
@@ -2585,7 +2584,9 @@ public class MesEnumUtil {
             return value;
         }
 
-        public String getCode() {return code;}
+        public String getCode() {
+            return code;
+        }
 
         public String getDescription() {
             return description;
@@ -5564,6 +5565,78 @@ public class MesEnumUtil {
     }
 
     /**
+     * 质检单状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_STATUS {
+        CREATE(10, "创建"),
+        RECEIPT(20, "执行中"),
+        SUBMISSION(30, "提交"),
+        COMPLETE(40, "完成");
+
+        private int value;
+        private String description;
+
+        QC_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 IN_READ_FLAG {
+        NOTREAD(0, "未读取"),
+        READ(1, "已读取");
+
+        private int value;
+        private String description;
+
+        IN_READ_FLAG(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;
+        }
+    }
+
+    /**
      * MES_检验单 状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -5657,4 +5730,267 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * MES_产品颜色 	类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_COLOR_TYPE {
+
+        PRODUCT_COLOR(10, "产品颜色"),
+        MATERIAL_COLOR(20, "物料颜色");
+
+        private int value;
+        private String description;
+
+        MES_COLOR_TYPE(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;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MES_车型散件配置清单 	选配类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_OPTION_TYPE {
+
+        OPTION_PART(1, "选配件"),
+        BOM_DISASSEMBLY(2, "BOM拆解");
+
+        private int value;
+        private String description;
+
+        MES_OPTION_TYPE(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;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 数据格式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_FORMAT {
+        STRING_FORMAT(1, "String", "字符串格式"),
+        INTEGER_FORMAT(2, "Integer", "整数格式"),
+        DOUBLE_FORMAT(3, "Double", "高精度浮点格式"),
+        DATE_FORMAT(4, "Date", "日期格式"),
+        FLOAT_FORMAT(5, "Float", "浮点格式"),
+        BOOL_FORMAT(6, "Boolean", "布尔格式"),
+        LONG_FORMAT(7, "LONG", "长整数格式");
+
+        private int value;
+        private String code;
+        private String description;
+
+        DATA_FORMAT(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 数据导入类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TEMPLATE_IMPORT_TYPE {
+        SINGLE_TABLE(10, "SINGLE_TABLE", "单表"),
+        MULTI_TABLE(20, "MULTI_TABLE", "多表");
+
+        private int value;
+        private String code;
+        private String description;
+
+        TEMPLATE_IMPORT_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 数据更新类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TEMPLATE_UPDATE_TYPE {
+        FULL_COVERAGE(10, "FULL_COVERAGE", "全覆盖"),
+        DIFF_UPDATE(20, "DIFF_UPDATE", "差异更新"),
+        REPEATE_NO_IMPORT(30, "REPEATE_NO_IMPORT", "重复不导入");
+
+        private int value;
+        private String code;
+        private String description;
+
+        TEMPLATE_UPDATE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
 }

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

@@ -925,10 +925,11 @@ public class MesPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_QC_CHECK_TYPE {
-
+        INCOMING_CHECK(5, "来料检验"),
         FIRST_CHECK(10, "首检"),
         ON_SITE_CHECK(20, "巡检"),
-        END_CHECK(30, "尾检");
+        END_CHECK(30, "末检"),
+        RC_CHECK(40, "发货检验");
 
         private int value;
         private String description;
@@ -1808,8 +1809,10 @@ public class MesPcnEnumUtil {
         STANDARD_ORDER(10, "标准工单"),
         BTS_ORDER(20, "BTS工单"),
         ATTEMPT_ORDER(30, "试制工单"),
-        BH_ORDER(40, "B&H工单");
-//        JIT_ORDER(50, "JIT工单");
+        BH_ORDER(40, "B&H工单"),
+        JIT_ORDER(50, "JIT工单"),
+        STOCK_ORDER(60, "库存工单"),
+        REPAIR(70,"返修插单");
 
         private int value;
         private String description;
@@ -2004,7 +2007,8 @@ public class MesPcnEnumUtil {
     public enum QUEUE_ORDER_DETAIL_STATUS {
 
         NORMAL(10, "正常"),
-        CLOSE(20, "关闭");
+        CLOSE(20, "关闭"),
+        FINISH(30, "完成");
 
         private int value;
         private String description;
@@ -2540,10 +2544,11 @@ public class MesPcnEnumUtil {
         TABLE("table", "表格"),
         TEXT("text", "正常文本"),
         EXP_TEXT("exp_text", "异常文本"),
-        FILE("file", "定制内容文件"),
+        FILE("file", "打印模板文件"),
         IMAGE("image", "图片"),
         BUTTON("button", "按钮"),
         TABLES("tables", "多个表格"),
+        CUSTOM("custom", "定制页面"),
         FORM("form", "文本按钮");
 
         private String value;
@@ -3242,6 +3247,7 @@ public class MesPcnEnumUtil {
     public enum TABLE_COLOR {
 
         GREEN("green", "绿色"),
+        RED("red", "红色"),
         YELLOW("Yellow", "黄色");
 
         private String code;
@@ -3564,4 +3570,114 @@ public class MesPcnEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 质检单状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_STATUS {
+        CREATE(10, "创建"),
+        RECEIPT(20, "执行中"),
+        SUBMISSION(30, "提交"),
+        COMPLETE(40, "完成");
+
+        private int value;
+        private String description;
+
+        QC_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 CHECK_REULST {
+
+        PASS(10, "通过"),
+        NON_PASS(20, "不通过"),
+        CONCESSION_PRODUCTION(30, "让步生产");
+
+        private int value;
+        private String description;
+
+        CHECK_REULST(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 QUEUE_ORDER_QUEUE_TYPE {
+        PRODUCT_QUEUE(10, "生产队列"),
+        PRELOAD_QUEUE(20, "预装队列");
+
+        private int value;
+        private String description;
+
+        QUEUE_ORDER_QUEUE_TYPE(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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -538,6 +538,14 @@ public class WmsEnumUtil {
             return code;
         }
 
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
         public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -873,7 +881,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -1085,6 +1093,10 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
 
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
@@ -1250,6 +1262,9 @@ public class WmsEnumUtil {
             return tmp;
         }
 
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
@@ -2816,7 +2831,7 @@ public class WmsEnumUtil {
         // 根据枚举编号获取语言代码
         public static String getCodeByIndex(Integer index) {
             for (LANGUAGE_TYPE languageType : LANGUAGE_TYPE.values()) {
-                if (languageType.getValue() == index.intValue()) {
+                if (languageType.getValue() == index) {
                     return languageType.getDescription();
                 }
             }
@@ -3283,7 +3298,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -3325,6 +3340,17 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+
+        public static String descriptionOfValue(String desc) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
@@ -3355,7 +3381,7 @@ public class WmsEnumUtil {
     }
 
     public static Map<String, Object> getEnumByName(String enumName) throws Exception {
-        Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
+        Class[] innerClazz = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
         Class<Enum> clazz;
         Enum[] enumConstants;
 
@@ -3453,7 +3479,7 @@ public class WmsEnumUtil {
         public static String getDescription(String code) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == code) {
+                if (values()[i].value.equals(code)) {
                     tmp = values()[i].description;
                 }
             }
@@ -3576,8 +3602,7 @@ public class WmsEnumUtil {
     public enum WMS_STOCK_TYPE {
         SOURCE(10, "实物条码"),
         TARGET(20, "虚拟条码"),
-        CUST_SN(30, "客户条码"),
-        FIRST_MIDDLE_LAST(40, "首中末件");
+        CUST_SN(30, "客户条码");
 
         private int value;
         private String description;
@@ -3702,7 +3727,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -3742,7 +3767,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -3876,7 +3901,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -4802,6 +4827,17 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static int descriptionOfValue(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
     }
 
     /**
@@ -6416,6 +6452,53 @@ public class WmsEnumUtil {
     }
 
     /**
+     * BatchHold 值类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FG_INSTOCK_SN_TYPE {
+        NORMAL(10, "NORMAL", "实物条码(正常)"),
+        FIRST_PIECE(20, "FIRST_PIECE", "首件"),
+        MIDDLE_PIECE(30, "MIDDLE_PIECE", "中件"),
+        TAIL_PIECE(40, "TAIL_PIECE", "末件");
+
+        private int value;
+        private String code;
+        private String description;
+
+        FG_INSTOCK_SN_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
      * 返修、挑选状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -6528,4 +6611,359 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * 运输方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TRANSPORT_TYPE {
+        LONG_HAUL(10, "长途运输"),
+        SHORT_DISTANCE(20, "短途运输");
+
+        private int value;
+        private String description;
+
+        TRANSPORT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static TRANSPORT_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 物流供应商类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOGISTICS_PROVIDER_TYPE {
+        VENDOR(10, "承运商");
+
+        private int value;
+        private String description;
+
+        LOGISTICS_PROVIDER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static LOGISTICS_PROVIDER_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * BatchHold 物料检测标准值
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_PART_CHECK_STD {
+        NUMBER(1, "NORMAL", "合格"),
+        TEXT(2, "ABNORMAL", "不合格");
+
+        private int value;
+        private String code;
+        private String description;
+
+        BH_PART_CHECK_STD(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+
+    /**
+     * BH检测结果类型 RepairOrPick
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_TEST_RESULT_TYPE {
+        PICK(10, "NORMAL", "挑选"), REPAIR(20, "ABNORMAL", "返修");
+        private int value;
+        private String code;
+        private String description;
+
+        BH_TEST_RESULT_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static BH_TEST_RESULT_TYPE codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+
+    /**
+     * BH检测结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_TEST_RESULT_STATUS {
+        NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格");
+        private int value;
+        private String code;
+        private String description;
+
+        BH_TEST_RESULT_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static BH_TEST_RESULT_STATUS codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * 仓库健康指标等级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum HEALTH_INDICATOR_LEVEL {
+        HEALTH(10, "HEALTH", "健康"),
+        SUB_HEALTH(20, "SUB_HEALTH", "亚健康"),
+        NO_HEALTH(30, "NO_HEALTH", "不健康");
+        private int value;
+        private String code;
+        private String description;
+
+        HEALTH_INDICATOR_LEVEL(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api(value = "表单按钮", description = "表单按钮")
 public class BfButton extends BaseBean {
 
+    private static final long serialVersionUID = -1675967061983417558L;
     @Column(name = "BUTTON_NAME")
     @ApiParam(value = "按钮名称")
     private String buttonName;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java

@@ -33,6 +33,7 @@ import java.util.List;
 @Api(value="级联元素",description = "级联元素")
 public class BfCascade extends BaseBean {
 
+    private static final long serialVersionUID = -2114224803602089395L;
     @Column(name = "ELEMENT_ID")
     @ApiParam(value = "对象元素ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value="级联元素明细",description = "级联元素")
 public class BfCascadeDetail extends BaseBean {
 
+    private static final long serialVersionUID = -8365699249398175846L;
     @Column(name = "CASCADE_ID")
     @ApiParam(value = "级联ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java

@@ -30,6 +30,7 @@ import java.util.List;
 @Api(value="数据对象",description = "原数据对象，最原始数据")
 public class BfDataObject extends BaseBean {
 
+    private static final long serialVersionUID = -6450328805517462673L;
     @Column(name = "DATA_SOURCE_ID")
     @ApiParam(value = "数据源ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java

@@ -33,6 +33,7 @@ import java.util.List;
 @Api(value = "数据对象属性表", description = "数据对象的属性明细表")
 public class BfDataObjectProperty extends BaseBean {
 
+    private static final long serialVersionUID = 2607149135728621568L;
     //外键关联数据对象主键
     @Column(name = "DATA_OBJECT_ID")
     @ApiParam(value = "数据对象ID", example = "-1")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataSource.java

@@ -29,6 +29,7 @@ import java.util.List;
 @Api(value="数据对象",description = "原数据对象，最原始数据")
 public class BfDataSource extends BaseBean {
 
+    private static final long serialVersionUID = -749606489129498769L;
     @Column(name="SOURCE_NAME")
     @ApiParam(value ="数据源名称")
     private String sourceName;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -33,6 +33,7 @@ import java.util.List;
 @Api(value = "对象元素基础", description = "元素基础表")
 public class BfElement extends BaseBean {
 
+    private static final long serialVersionUID = -3309080566388373068L;
     //外键关联数据对象主键
     @Column(name = "ELEMENT_INFO_ID")
     @ApiParam(value = "对象元素明细ID", example = "-1")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java

@@ -33,6 +33,7 @@ import javax.persistence.Table;
 @Api(value = "元素约束", description = "元素约束")
 public class BfElementConstraint  extends BaseBean {
 
+    private static final long serialVersionUID = 6951083749548881908L;
     @Column(name = "ELEMENT_ID")
     @ApiParam(value = "对象元素ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java

@@ -32,6 +32,7 @@ import javax.persistence.Table;
 @Api(value = "对象元素表格", description = "对象元素表格")
 public class BfElementGrid extends BaseBean {
 
+    private static final long serialVersionUID = -3730288075103132153L;
     //外键关联数据对象主键
     @Column(name = "ELEMENT_ID")
     @ApiParam(value = "对象元素ID", example = "-1")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java

@@ -32,6 +32,7 @@ import javax.persistence.Transient;
 @Api(value="对象元素属性",description = "对象元素属性 相当于数据对象属性的扩展")
 public class BfElementProperty extends BaseBean {
 
+    private static final long serialVersionUID = 8391877375302721425L;
     @Column(name = "ELEMENT_ID")
     @ApiParam(value = "对象元素ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java

@@ -30,6 +30,7 @@ import java.util.List;
 @Api(value="对象元素虚拟属性",description = "对象元素虚拟属性")
 public class BfElementPropertyVirtual extends BaseBean {
 
+    private static final long serialVersionUID = -8746243539245788738L;
     @Column(name = "ELEMENT_ID")
     @ApiParam(value = "对象元素ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java

@@ -31,6 +31,7 @@ import javax.persistence.Transient;
 @Api(value = "对象元素基础", description = "元素基础表")
 public class BfElementTree extends BaseBean {
 
+    private static final long serialVersionUID = -6173269177770192337L;
     //外键关联数据对象主键
     @Column(name = "ELEMENT_ID")
     @ApiParam(value = "对象元素ID", example = "-1")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -30,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="拦截器主体")
 public class BfIntercept extends BaseBean {
 
+    private static final long serialVersionUID = -7880837699871138830L;
     @Column(name="INTERCEPT_NAME")
     @ApiParam(value ="拦截器名称")
     private String interceptName;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java

@@ -31,6 +31,7 @@ import javax.persistence.Transient;
 @Api(value="拦截器明细")
 public class BfInterceptDetail extends BaseBean {
 
+    private static final long serialVersionUID = -2813973524088674573L;
     @Column(name="INTERCEPT_ID")
     @ApiParam(value ="拦截器id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 import java.util.List;
@@ -28,6 +27,7 @@ import java.util.List;
 @Api(value = "自定义表单布局")
 public class BfLayout extends BaseBean {
 
+    private static final long serialVersionUID = 4951428858633293563L;
     @Column(name = "LAYOUT_NAME")
     @ApiParam(value = "名称")
     private String layoutName;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value = "自定义表单布局-列")
 public class BfLayoutColumn extends BaseBean {
 
+    private static final long serialVersionUID = -8711414349182712011L;
     @Column(name = "LAYOUT_ID")
     @ApiParam(value = "布局主键")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java

@@ -9,7 +9,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 import java.util.List;
@@ -30,6 +29,7 @@ import java.util.List;
 @Api(value = "自定义表单布局-行")
 public class BfLayoutRow extends BaseBean {
 
+    private static final long serialVersionUID = -3327441937912038000L;
     @Column(name = "LAYOUT_ID")
     @ApiParam(value = "布局主键")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java

@@ -32,6 +32,7 @@ import java.util.List;
 @Api(value="表单菜单目录",description = "表单菜单目录")
 public class BfMenu extends BaseBean {
 
+    private static final long serialVersionUID = 6559248298739431579L;
     @Column(name="MENU_NAME")
     @ApiParam(value ="菜单名称")
     private String menuName;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java

@@ -32,6 +32,7 @@ import java.util.List;
 @Api(value="表单功能",description = "表单功能")
 public class BfMethod extends BaseBean {
 
+    private static final long serialVersionUID = 6976569600026342045L;
     @Column(name="METHOD_NAME")
     @ApiParam(value ="功能名称")
     private String methodName;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java

@@ -32,6 +32,7 @@ import java.util.List;
 @Api(value="表单功能明细",description = "表单功能明细")
 public class BfMethodDetail extends BaseBean {
 
+    private static final long serialVersionUID = 3982619673130000003L;
     @Column(name="METHOD_ID")
     @ApiParam(value ="功能id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value="表单功能明细关联属性",description = "表单功能明细关联属性")
 public class BfMethodDetailProperty extends BaseBean {
 
+    private static final long serialVersionUID = -7541677357317732343L;
     @Column(name="METHOD_ID")
     @ApiParam(value ="功能id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java

@@ -31,6 +31,7 @@ import javax.persistence.Transient;
 @Api(value="按钮功能关系",description = "按钮功能关系")
 public class BfRefButtonMethod extends BaseBean {
 
+    private static final long serialVersionUID = 1145541515189800147L;
     @Column(name="BUTTON_ID")
     @ApiParam(value ="按钮id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefElementPropertyVirtualDetail.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value="对象元素虚拟属性",description = "对象元素虚拟属性")
 public class BfRefElementPropertyVirtualDetail extends BaseBean {
 
+    private static final long serialVersionUID = 3315763374468711786L;
     @Column(name = "ELEMENT_ID")
     @ApiParam(value = "对象元素ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api(value = "功能角色关系", description = "功能角色关系")
 public class BfRefMethodRole extends BaseBean {
 
+    private static final long serialVersionUID = 8134565165534099843L;
     @Column(name = "METHOD_ID")
     @ApiParam(value = "表单功能id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.ics.bean;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -13,8 +14,9 @@ import java.util.List;
  * @Modify:
  **/
 @Data
-public class IcsActuatorMetrics {
+public class IcsActuatorMetrics implements Serializable {
 
+    private static final long serialVersionUID = 4341201186821752353L;
     private String name;
     private List<Measurements> measurements;
     private List<AvailableTags> availableTags;

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -16,8 +17,9 @@ import java.util.List;
  **/
 @Data
 @ApiModel("应用信息")
-public class IcsApplication {
+public class IcsApplication implements Serializable {
 
+    private static final long serialVersionUID = -1923997516217683087L;
     @ApiModelProperty("应用名称")
     private String appName;
 

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description :
  * @Reference :
@@ -14,8 +16,9 @@ import lombok.Data;
  **/
 @Data
 @ApiModel("实例信息")
-public class IcsInstance {
+public class IcsInstance implements Serializable {
 
+    private static final long serialVersionUID = 2648298051066693374L;
     @ApiModelProperty("实例id")
     private String instanceId;
 
@@ -31,7 +34,7 @@ public class IcsInstance {
     @ApiModelProperty("状态时间")
     private String statusTimeStampStr;
 
-    public String getInstanceStatusTxt(){
-        return instanceStatus == null ?"无": CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(instanceStatus);
+    public String getInstanceStatusTxt() {
+        return instanceStatus == null ? "无" : CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(instanceStatus);
     }
 }

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description : 实例明细
  * @Reference :
@@ -13,8 +15,9 @@ import lombok.Data;
  **/
 @Data
 @ApiModel("实例明细")
-public class IcsInstanceDetail {
+public class IcsInstanceDetail implements Serializable {
 
+    private static final long serialVersionUID = -348649782622051827L;
     @ApiModelProperty("pid")
     private String pid;
 

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description : 实例堆内存
  * @Reference :
@@ -13,8 +15,9 @@ import lombok.Data;
  **/
 @Data
 @ApiModel("实例堆内存")
-public class IcsInstanceMemoryHeap {
+public class IcsInstanceMemoryHeap implements Serializable {
 
+    private static final long serialVersionUID = -5982536759101768884L;
     @ApiModelProperty("堆使用的内存")
     private double heapMemoryUsed;
 

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description :实例堆非内存
  * @Reference :
@@ -13,8 +15,9 @@ import lombok.Data;
  **/
 @Data
 @ApiModel("实例堆非内存")
-public class IcsInstanceMemoryNonHeap {
+public class IcsInstanceMemoryNonHeap implements Serializable {
 
+    private static final long serialVersionUID = 5457399972284816473L;
     @ApiModelProperty("非堆内存元空间")
     private double nonHeapMemoryMetaspace;
 

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description : 实例线程信息
  * @Reference :
@@ -13,8 +15,9 @@ import lombok.Data;
  **/
 @Data
 @ApiModel("实例线程信息")
-public class IcsInstanceThread {
+public class IcsInstanceThread implements Serializable {
 
+    private static final long serialVersionUID = -272358532317411617L;
     @ApiModelProperty("实时线程")
     private double threadLive;
 

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -15,8 +16,9 @@ import java.util.List;
  **/
 @Data
 @ApiModel("注册中心")
-public class IcsRegist {
+public class IcsRegist  implements Serializable {
 
+    private static final long serialVersionUID = -5624347440991960286L;
     @ApiModelProperty("环境")
     private String environment;
 

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description :
  * @Reference :
@@ -15,25 +17,27 @@ import lombok.Data;
  **/
 @Data
 @ApiModel("指令操作")
-public class LacCommandOperate {
+public class LacCommandOperate implements Serializable {
 
-    @ApiParam(value ="指令集记录id" , example = "-1")
+    private static final long serialVersionUID = 2877359322522442241L;
+    @ApiParam(value = "指令集记录id", example = "-1")
     private Long operateObjId;
 
-    @ApiParam(value ="操作对象类型" , example = "-1")
+    @ApiParam(value = "操作对象类型", example = "-1")
     @AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_OBJ_TYPE.class)
     private Integer operateObjType;
 
-    @ApiParam(value ="操作" , example = "-1")
+    @ApiParam(value = "操作", example = "-1")
     @AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_COMMAND.class)
     private Integer operateCommand;
 
-    public LacCommandOperate(){}
+    public LacCommandOperate() {
+    }
 
-    public LacCommandOperate(Long operateObjId,Integer operate){
+    public LacCommandOperate(Long operateObjId, Integer operate) {
         this.operateObjId = operateObjId;
         LacEnumUtil.OPERATE_COMMAND operate_command = LacEnumUtil.OPERATE_COMMAND.valueOf(operate);
-        if(operate_command!=null) {
+        if (operate_command != null) {
             this.operateCommand = operate_command.getValue();
             this.operateObjType = operate_command.getOperateObjType().getValue();
         }

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java

@@ -52,6 +52,7 @@ import java.util.List;
 @Api(value="指令集步骤",description = "指令集步骤")
 public class LacCommandStackStep extends BaseBean {
 
+    private static final long serialVersionUID = 4053765920069631323L;
     @Column(name="TEMPLATE_ID")
     @ApiParam(value ="模板ID")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java

@@ -55,6 +55,7 @@ import javax.persistence.Transient;
 @Api(value="步骤任务",description = "步骤任务信息")
 public class LacCommandStackStepTask extends BaseBean {
 
+    private static final long serialVersionUID = 7432247591995852126L;
     @Column(name="TEMPLATE_ID")
     @ApiParam(value ="模板ID")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java

@@ -49,6 +49,7 @@ import java.util.List;
 @Api(value="指令集模板",description = "指令集模板信息")
 public class LacCommandStackTemplate extends BaseBean {
 
+    private static final long serialVersionUID = 4884527553767334910L;
     @Column(name="TEMPLATE_NAME")
     @ApiParam(value ="模板名称")
     private String templateName;

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java

@@ -24,21 +24,22 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="LAC_COMMAND_STACK_TYPE")
-@Api(value="指令集类型",description = "指令集类型")
+@Table(name = "LAC_COMMAND_STACK_TYPE")
+@Api(value = "指令集类型", description = "指令集类型")
 public class LacCommandStackType extends BaseBean {
 
 
-    @Column(name="TYPE_NAME")
-    @ApiParam(value ="类型名称")
+    private static final long serialVersionUID = -2699452452325728351L;
+    @Column(name = "TYPE_NAME")
+    @ApiParam(value = "类型名称")
     private String typeName;
 
-    @Column(name="TYPE_REF_NUM")
-    @ApiParam(value ="适配器使用数量")
+    @Column(name = "TYPE_REF_NUM")
+    @ApiParam(value = "适配器使用数量")
     private Integer typeRefNum;
 
-    @Column(name="TYPE_DESCRIPTION")
-    @ApiParam(value ="类型描述")
+    @Column(name = "TYPE_DESCRIPTION")
+    @ApiParam(value = "类型描述")
     private String typeDescription;
 
 }