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

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

@@ -0,0 +1,56 @@
+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;
+
+    @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 = "ANDON_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,99 @@
+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;
+
+    @Column(name = "INTERFACE_NO")
+    @ApiParam("界面编号")
+    private String interfaceNo;
+
+    @Transient
+    @ApiParam("安灯流程ID")
+    private Long alarmRouteId;
+
+    @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/AndonRouteStatusErrorRecord.java

@@ -0,0 +1,67 @@
+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_ERROR_RECORD")
+@EqualsAndHashCode(callSuper = true)
+@Api("流程状态异常记录")
+public class AndonRouteStatusErrorRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -4046192879130584866L;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @Column(name = "ANDON_ORDER_NO")
+    @ApiParam(value = "安灯队列编号")
+    public String andonOrderNo;
+
+    @Column(name = "ERROR_DESC")
+    @ApiParam(value = "失败描述")
+    public String errorDesc;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心")
+    public String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam(value = "工作中心")
+    public String workCellCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    public String alarmCode;
+
+    @Column(name = "SOURCE_TYPE")
+    @ApiParam(value = "安灯来源类型")
+    private String sourceType;
+
+}

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,92 @@
+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;
+
+    @ApiParam("界面编号")
+    private String interfaceNo;
+
+    @ApiParam("安灯流程ID")
+    private Long alarmRouteId;
+
+    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 interfaceNo, String alarmCode, String workCenterCode, Integer routeType, Long alarmRouteId) {
+        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.interfaceNo = interfaceNo;
+        this.alarmCode = alarmCode;
+        this.workCenterCode = workCenterCode;
+        this.routeType = routeType;
+        this.alarmRouteId = alarmRouteId;
+    }
+}

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,48 @@
+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;
+
+    @ApiModelProperty("下个触发事件，一个组件集执行完毕后这个值赋给triggerEvent")
+    private String nextTriggerEvent;
+
+}

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/IAndonActionModuleParamRepository.java

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

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

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

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-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteModuleParamRepository.java

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

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

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

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

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

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

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

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

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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -3,14 +3,9 @@ package cn.estsh.i3plus.pojo.andon.sqlpack;
 import cn.estsh.i3plus.pojo.andon.bean.*;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
-import cn.estsh.i3plus.pojo.base.bean.ListPager;
-import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * @Description : 安灯对象查询封装
@@ -62,7 +57,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpLevel(), "rpLevel", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpObjectCode(), "rpObjectCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getStatusCode(), "statusCode", packBean);
-        if(StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeEnd())){
+        if(!StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeEnd())){
             DdlPreparedPack.timeBuilder(andonMessageRecord.getCreateDateTimeStart(), andonMessageRecord.getCreateDateTimeEnd(), "createDatetime", packBean, true);
         }
         return packBean;
@@ -209,7 +204,7 @@ public class AndonHqlPack {
     public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) {
 
         // 判断工厂代码是否为空
-        if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
+        if (!StringUtils.isEmpty(bean.getOrganizeCode())) {
             DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
         }
 
@@ -373,7 +368,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEcCode(), "ecCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEmCode(), "emCode", packBean);
 
-        if(StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeEnd())){
+        if(!StringUtils.isEmpty(andonKnowledgeBase.getCreateDateTimeStart()) || !StringUtils.isEmpty(andonKnowledgeBase.getCreateDateTimeEnd())){
             DdlPreparedPack.timeBuilder(andonKnowledgeBase.getCreateDateTimeStart(), andonKnowledgeBase.getCreateDateTimeEnd(), "createDatetime", packBean, true);
         }
 
@@ -418,7 +413,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getInPackList(andonManageQueue.getTypeList(), "alarmCode", result); // 只有安灯任务管理特殊用途
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
 
-        if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){
+        if(!StringUtils.isEmpty(andonManageQueue.getCallTimeStart()) || !StringUtils.isEmpty(andonManageQueue.getCallTimeEnd())){
             DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true);
         }
         getStringBuilderPack(andonManageQueue, result);
@@ -557,10 +552,10 @@ public class AndonHqlPack {
      */
     public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode);
-        if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){
+        if (!StringUtils.isEmpty(mesEquipment.getWorkCellCode())){
             DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){
+        if (!StringUtils.isEmpty(mesEquipment.getEquipmentCode())){
             DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean);
         }
         packBean.setOrderByStr(mesEquipment.orderBy());
@@ -575,13 +570,13 @@ public class AndonHqlPack {
      */
     public static DdlPackBean getMesShift(MesShift shift, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode);
-        if (StringUtils.isNotEmpty(shift.getShiftCode())){
+        if (!StringUtils.isEmpty(shift.getShiftCode())){
             DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean);
         }
-        if (StringUtils.isNotEmpty(shift.getShiftName())){
+        if (!StringUtils.isEmpty(shift.getShiftName())){
             DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean);
         }
-        if (StringUtils.isNotEmpty(shift.getWorkCenterCode())){
+        if (!StringUtils.isEmpty(shift.getWorkCenterCode())){
             DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean);
         }
 
@@ -876,4 +871,121 @@ public class AndonHqlPack {
         DdlPreparedPack.timeBuilder(startDateTime, endDateTime, "createDatetime", result, true);
         return result;
     }
+
+    /**
+     * actor信息
+     * @param actor
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonActor(AndonActor actor, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(actor, organizeCode);
+        if (!StringUtils.isEmpty(actor.getActorCode())) {
+            DdlPreparedPack.getStringLikerPack(actor.getActorCode(), "actorCode", packBean);
+        }
+        if (!StringUtils.isEmpty(actor.getActorName())) {
+            DdlPreparedPack.getStringLikerPack(actor.getActorName(), "actorName", packBean);
+        }
+        if (!StringUtils.isEmpty(actor.getActorClass())) {
+            DdlPreparedPack.getStringLikerPack(actor.getActorClass(), "actorClass", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 消息类型
+     * @param messageType
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonMessageType(AndonMessageType messageType, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(messageType, organizeCode);
+        if (!StringUtils.isEmpty(messageType.getMtCode())) {
+            DdlPreparedPack.getStringLikerPack(messageType.getMtCode(), "mtCode", packBean);
+        }
+        if (!StringUtils.isEmpty(messageType.getMtName())) {
+            DdlPreparedPack.getStringLikerPack(messageType.getMtName(), "mtName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * actor消息类型配置
+     * @param actorRule
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonActorRule(AndonActorRule actorRule, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(actorRule, organizeCode);
+        if (!StringUtils.isEmpty(actorRule.getActorCode())) {
+            DdlPreparedPack.getStringLikerPack(actorRule.getActorCode(), "actorCode", packBean);
+        }
+        if (!StringUtils.isEmpty(actorRule.getMtCode())) {
+            DdlPreparedPack.getStringLikerPack(actorRule.getMtCode(), "mtCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 安灯类型
+     * @param alarmType
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonAlarmType(AndonAlarmType alarmType, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(alarmType, organizeCode);
+        if (!StringUtils.isEmpty(alarmType.getAlarmCode())) {
+            DdlPreparedPack.getStringLikerPack(alarmType.getAlarmCode(), "alarmCode", packBean);
+        }
+        if (!StringUtils.isEmpty(alarmType.getAlarmName())) {
+            DdlPreparedPack.getStringLikerPack(alarmType.getAlarmName(), "alarmName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 组件
+     * @param actionModule
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonActionModule(AndonActionModule actionModule, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(actionModule, organizeCode);
+        if (!StringUtils.isEmpty(actionModule.getAmCode())) {
+            DdlPreparedPack.getStringLikerPack(actionModule.getAmCode(), "amCode", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModule.getAmName())) {
+            DdlPreparedPack.getStringLikerPack(actionModule.getAmName(), "amName", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModule.getCallClass())) {
+            DdlPreparedPack.getStringLikerPack(actionModule.getCallClass(), "callClass", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModule.getAmType())) {
+            DdlPreparedPack.getNumEqualPack(actionModule.getAmType(), "amType", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 组件参数
+     * @param actionModuleParam
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonActionModuleParam(AndonActionModuleParam actionModuleParam, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(actionModuleParam, organizeCode);
+        if (!StringUtils.isEmpty(actionModuleParam.getAmCode())) {
+            DdlPreparedPack.getStringLikerPack(actionModuleParam.getAmCode(), "amCode", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModuleParam.getParamCode())) {
+            DdlPreparedPack.getStringLikerPack(actionModuleParam.getParamCode(), "paramCode", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModuleParam.getParamName())) {
+            DdlPreparedPack.getStringLikerPack(actionModuleParam.getParamName(), "paramName", packBean);
+        }
+        if (!StringUtils.isEmpty(actionModuleParam.getParamType())) {
+            DdlPreparedPack.getNumEqualPack(actionModuleParam.getParamType(), "paramType", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -13,6 +13,164 @@ import org.apache.commons.lang3.StringUtils;
 public class AndonEnumUtil {
 
     /**
+     * 状态点界面编号
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ANDON_ROUTE_STATUS_INTERFACE_NO {
+        EQUMENT_ALARM_CALL("EQUMENT_ALARM_CALL", "设备呼叫弹框界面"),
+        QUALITY_ALARM_CALL("QUALITY_ALARM_CALL", "质量呼叫弹框界面"),
+        PART_ALARM_CALL("PART_ALARM_CALL", "物料呼叫弹框界面"),
+        ROUTING_ALARM_CALL("ROUTING_ALARM_CALL", "工艺呼叫弹框界面"),
+        OTHER_ALARM_CALL("OTHER_ALARM_CALL", "自处理呼叫弹框界面"),
+        FIX_ERROR_CALL("FIX_ERROR_CALL", "自动报警呼叫弹框界面"),
+        ALARM_SIGN("ALARM_SIGN", "响应弹框界面"),
+        ALARM_CANCEL("ALARM_CANCEL", "撤销二次提醒框"),
+        ALARM_RESOLVE("ALARM_RESOLVE", "解决弹框界面");
+
+        private String value;
+        private String description;
+
+        ANDON_ROUTE_STATUS_INTERFACE_NO(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 组件参数类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTION_MODULE_PARAM_TYPE {
+
+        QUALIFIED(10, "number", "数字"),
+        DEFECTED(20, "text", "字符串"),
+        SCRAPED(30, "select", "可选值"),
+        BUTTON(40, "button", "按钮");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ACTION_MODULE_PARAM_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;
+        }
+
+        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 ACTION_MODULE_AM_TYPE {
+        COMMON_MODULE(10, "通用组件");
+
+        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;
+        }
+    }
+
+    /**
+     * 流程状态-触发类型
+     */
+    @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;
+        }
+    }
+
+    /**
      * 安灯主界面产线或者站点运行状态
      * 正常 = 10，故障 = 20
      */
@@ -737,21 +895,23 @@ public class AndonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ANDON_ACTION_TAG {
-        CALL(1,"10","呼叫"),
-        SIGN(2,"20","响应"),
-        RESOLVE(3,"30","解决"),
-        CANCEL(4,"40", "撤销"),
-        COMMIT(5,"50","解决待审"),
-        PASS(6,"60","审批完成"),
-        REJECT(7,"70","驳回"),
-        CONFIRMED_CANCEL(8,"80","撤销已确认");
+        CALL(1, "1","10","呼叫"),
+        SIGN(2, "2","20","响应"),
+        RESOLVE(3, "3","30","解决"),
+        CANCEL(4, "4","40", "撤销"),
+        COMMIT(5, "5","50","解决待审"),
+        PASS(6, "6","60","审批完成"),
+        REJECT(7, "7","70","驳回"),
+        CONFIRMED_CANCEL(8, "8","80","撤销已确认");
 
         private int value;
+        private String valueStr;
         private String code;
         private String description;
 
-        ANDON_ACTION_TAG(int value, String code, String description) {
+        ANDON_ACTION_TAG(int value, String valueStr, String code, String description) {
             this.value = value;
+            this.valueStr = valueStr;
             this.code = code;
             this.description = description;
         }
@@ -760,12 +920,32 @@ public class AndonEnumUtil {
             return value;
         }
 
+        public String getValueStr(){ return valueStr; }
+
         public String getCode(){ return code; }
 
         public String getDescription() {
             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 ANDON_ACTION_TAG getByValueStr(String valueStr) {
+            for (ANDON_ACTION_TAG actionTag : values()) {
+                if (actionTag.getValueStr().equals(valueStr)) {
+                    return actionTag;
+                }
+            }
+            return null;
+        }
+
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -924,6 +1104,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

@@ -19,60 +19,69 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SOFT_TYPE {
-        IMPP(1, 0, 0, "impp-platform", "IMPP平台"),
-        CORE(2, 8100, 4, "i3core", "i3业务平台"),
-        WMS(3, 8200, 10, "i3wms", "仓库管理软件"),
-        MES(4, 8300, 11, "i3mes", "生产管理软件"),
-        QMS(5, 0, 0, "i3qms", "质量管理软件"),
-        MES_PCN(6, 8350, 12, "i3mes-pcn", "生产管理软件-节点中心"),
-        SWEB(7, 8800, 19, "i3sweb", "供应商服务"),
-
-        PTL(8, 8700, 20, "i3ptl", "亮灯自动拣选"),
-        PTL_PCN(9, 8750, 21, "i3ptl-pcn", "亮灯自动拣选-节点中心"),
-
-        FORM(20, 8900, 16, "block-form", "智能表单"),
-        REPORT(21, 8910, 17, "block-report", "智能报表"),
-        WORKFLOW(22, 0, 0, "block-workflow", "智能工作流"),
-        JOBFLOW(23, 0, 0, "block-jobflow", "智能作业流"),
-        SOFTSWITCH(24, 8920, 18, "block-softswitch", "软件适配器"),
-        HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"),
-        LAC(26, 8600, 13, "lac", "连接适配器"),
-        ANDON(27, 8500, 14, "andon", "安灯"),
-        APS(28, 8400, 15, "i3aps", "高级计划与排产"),
-
-        MDM(29, 8150, 22, "i3mdm", "数据中心MDM"),
-        CENTER(99, 8000, 1, "icloud-server", "注册中心"),
-        SURFACE(98, 0, 0, "i3surface", "对外服务"),
-        CLOUD(97, 0, 0, "i3cloud", "微服务"),
-        GATEWAY(96, 9000, 3, "impp-gateway", "服务网关"),
-        CONSOLE(95, 8010, 2, "impp-console", "服务监控台"),
-        DEV(9999, 0000, 0, "Development", "系统调试");
+        /** WMS 服务 */
+        WMS(3, 8200, 10, 102000000L, "i3wms", "仓库管理软件"),
+        SWEB(7, 8800, 19, 108000000L, "i3sweb", "供应商服务"),
+        QMS(5, 0, 0, 0, "i3qms", "质量管理软件"),
 
-        /**
-         * 产品ID
-         */
+        /** Mes 服务 */
+        MES(4, 8300, 11, 103000000L, "i3mes", "生产管理软件"),
+        MES_PCN(6, 8350, 12, 107000000L, "i3mes-pcn", "生产管理软件-节点中心"),
+
+        /** PTL 服务 */
+        PTL(8, 8700, 20, 111000000L, "i3ptl", "亮灯自动拣选"),
+        PTL_PCN(9, 8750, 21, 109000000L, "i3ptl-pcn", "亮灯自动拣选-节点中心"),
+
+        /** Block 服务 */
+        FORM(20, 8900, 16, 104000000L, "block-form", "智能表单"),
+        REPORT(21, 8910, 17, 105000000L, "block-report", "智能报表"),
+        WORKFLOW(22, 0, 0, 0, "block-workflow", "智能工作流"),
+        JOBFLOW(23, 0, 0, 0, "block-jobflow", "智能作业流"),
+        SOFTSWITCH(24, 8920, 18, 130000000L, "block-softswitch", "软件适配器"),
+        HARDSWITCH(25, 0, 0, 0, "block-hardswitch", "硬件适配器"),
+
+        /** LAC 服务 */
+        LAC(26, 8600, 13, 150000000L, "lac", "连接适配器"),
+
+        /** 安灯服务 */
+        ANDON(27, 8500, 14, 110000000L, "andon", "安灯"),
+
+        /** 计划排产服务 */
+        APS(28, 8400, 15, 140000000L, "i3aps", "高级计划与排产"),
+        SURFACE(98, 0, 0, 0, "i3surface", "对外服务"),
+
+        /** 基础服务 */
+        IMPP(1, 0, 0, 100000000L, "impp-platform", "IMPP平台"),
+        CONSOLE(95, 8010, 0, 0, "impp-console", "服务监控台"),
+        GATEWAY(96, 9000, 0, 0, "impp-gateway", "服务网关"),
+        CLOUD(97, 0, 0, 0, "i3cloud", "微服务"),
+        CENTER(99, 8000, 1, 0, "icloud-server", "注册中心"),
+
+        /** 平台服务 */
+        CORE(2, 8100, 4, 101000000L, "i3core", "i3业务平台"),
+
+        /** 调试服务 */
+        DEV(9999, 0000, 0, 120000000L, "Development", "系统调试");
+
+
+        /** 产品ID */
         private int value;
-        /**
-         * 应用默认端口
-         */
-        private int prot;
-        /**
-         * 应用默认雪花DataBaseId(0-31)共32 个存储区
-         */
+        /** 应用默认端口 */
+        private int port;
+        /** 应用默认雪花DataBaseId(0-31)共32 个存储区 */
         private int snowflakeId;
-        /**
-         * 产品代码
-         */
+        /** 产品代码 */
         private String code;
-        /**
-         * 产品描述
-         */
+        /** 顶级菜单代码 */
+        private long menuRootId;
+        /** 产品描述 */
         private String description;
 
-        SOFT_TYPE(int value, int prot, int snowflakeId, String code, String description) {
+        SOFT_TYPE(int value, int port, int snowflakeId, long menuRootCode, String code, String description) {
             this.value = value;
-            this.prot = prot;
+            this.port = port;
             this.snowflakeId = snowflakeId;
+            this.menuRootId = menuRootCode;
             this.code = code;
             this.description = description;
         }
@@ -89,14 +98,18 @@ public class CommonEnumUtil {
             return description;
         }
 
-        public int getProt() {
-            return prot;
+        public int getPort() {
+            return port;
         }
 
         public int getSnowflakeId() {
             return snowflakeId;
         }
 
+        public long getMenuRootId() {
+            return menuRootId;
+        }
+
         public static String valueOfCode(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -137,7 +150,6 @@ public class CommonEnumUtil {
         }
 
         public static SOFT_TYPE valueOf(int val) {
-            String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
                     return values()[i];
@@ -146,6 +158,15 @@ public class CommonEnumUtil {
             return null;
         }
 
+        public static SOFT_TYPE valueOfMenuRootId(long id) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].menuRootId == id) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
         public static SOFT_TYPE codeOfDescription(String code) {
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].code.equals(code)) {
@@ -923,7 +944,9 @@ public class CommonEnumUtil {
     public enum LOG_LOGIN_PLATFORM {
         PC_IMPP_CORE(10, "PC-IMPP", "PC后台管理端"),
         PC_WMS_SWEB(20, "PC-SWEB", "PC SWEB后台管理端"),
-        Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端");
+        Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端"),
+        MES_PCN(40, "MES-PCN", "MES-PCN"),
+        PTL_PCN(50, "PTL-PCN", "PTL-PCN");
 
         private int value;
         private String name;
@@ -2178,6 +2201,89 @@ public class CommonEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_SOURCE_STATUS {
+        CONN_SUCCESS(10, "验证成功", "验证成功"),
+        CONN_FAILURE(20, "验证失败", "验证失败");
+//        TIME_OUT(30, "连接超时", "连接超时"),
+//        AUTH_ERROR(40, "账号密码错误", "账号密码错误");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private DATA_SOURCE_STATUS (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;
+        }
+
+
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        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 DATA_SOURCE_STATUS valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
     /**
      * PC自定义搜索-字段类型
      * 10-文本，20-数字，30-下拉框，40，时间，50-开窗

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

@@ -14,14 +14,14 @@ public class MesEnumUtil {
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum HQL_EXPRESSION {
-        GT(">",">","大于"),
-        LT("<","<","小于"),
-        EQ("=","=","等于"),
-        NEQ("!=","!=","不等于"),
-        GTE(">=",">=","大于等于"),
-        LTE("<=","<=","小于等于"),
-        LIKE("like","like","LIKE"),
-        IN("in","in","包含");
+        GT(">", ">", "大于"),
+        LT("<", "<", "小于"),
+        EQ("=", "=", "等于"),
+        NEQ("!=", "!=", "不等于"),
+        GTE(">=", ">=", "大于等于"),
+        LTE("<=", "<=", "小于等于"),
+        LIKE("like", "like", "LIKE"),
+        IN("in", "in", "包含");
 
         private String value;
         private String code;
@@ -240,7 +240,7 @@ public class MesEnumUtil {
     }
 
     /**
-     *  排序校验模式
+     * 排序校验模式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CHECK_PROD_SEQ_FLAG {
@@ -307,13 +307,14 @@ public class MesEnumUtil {
     }
 
     /**
-     *  排序校验模式
+     * 排序校验模式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TOOLING_ACTION_RECORD_TYPE {
         REPLACE(10, "REPLACE", "更换"),
         WAREHOUSE(20, "WAREHOUSE", "入库"),
-        Use(30, "Use", "领用");
+        Use(30, "Use", "领用"),
+        ERROR(40, "ERROR", "异常操作");
 
         private int value;
         private String code;
@@ -371,6 +372,7 @@ public class MesEnumUtil {
             return valueOf(val);
         }
     }
+
     /**
      * JIS发运是否按主队列顺序扫描
      */
@@ -3241,7 +3243,7 @@ public class MesEnumUtil {
         BH_ORDER(40, "B&H工单"),
         JIT_ORDER(50, "JIT工单"),
         STOCK_ORDER(60, "库存工单"),
-        REPAIR(70,"返修插单");
+        REPAIR(70, "返修插单");
 
         private int value;
         private String description;
@@ -5009,7 +5011,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	作业校验模式
+     * 作业校验模式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CHECK_MODEL {
@@ -5044,7 +5046,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	PLC类型
+     * PLC类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PLC_TYPE {
@@ -5079,7 +5081,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	看板类型
+     * 看板类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum BOARD_TYPE {
@@ -5124,7 +5126,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	看板类型
+     * 看板类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum BOARD_OBJECT_TYPE {
@@ -5207,7 +5209,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	界面类型
+     * 界面类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WINDOW_TYPE {
@@ -5243,7 +5245,7 @@ public class MesEnumUtil {
 
 
     /**
-     * 	运算对象属性 运算类型
+     * 运算对象属性 运算类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OPERATE_TYPE {
@@ -5279,7 +5281,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	运算对象属性 属性类型
+     * 运算对象属性 属性类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ATTRIBUTE_TYPE {
@@ -5314,7 +5316,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	运算对象属性配置 赋值类型
+     * 运算对象属性配置 赋值类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum VALUE_TYPE {
@@ -5360,7 +5362,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	运算对象 对象代码
+     * 运算对象 对象代码
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OBJECT_CODE {
@@ -5406,7 +5408,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	脚本类型（组件、表单、报表、JOB、其他）
+     * 脚本类型（组件、表单、报表、JOB、其他）
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SCRIPT_TYPE {
@@ -5444,7 +5446,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	语言类型（Groovy、Python、JavaScript、Scala、Ruby）
+     * 语言类型（Groovy、Python、JavaScript、Scala、Ruby）
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SCRIPT_LANGUAGE {
@@ -5482,9 +5484,8 @@ public class MesEnumUtil {
     }
 
 
-
     /**
-     * 	运算对象代码
+     * 运算对象代码
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OPERATE_OBJECT_CODE {
@@ -5530,7 +5531,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	oee 运算状态
+     * oee 运算状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OEE_STATUS {
@@ -5730,4 +5731,305 @@ public class MesEnumUtil {
         }
     }
 
+
+    /**
+     * MES_PLC 数据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_DATA_TYPE {
+
+        INT("int", "数字"),
+        STRING("string", "字符串"),
+        BOOLEAN("boolean", "布尔");
+
+        private String value;
+        private String description;
+
+        PLC_DATA_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 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

@@ -1809,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;
@@ -2005,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;
@@ -2541,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;
@@ -3243,6 +3247,7 @@ public class MesPcnEnumUtil {
     public enum TABLE_COLOR {
 
         GREEN("green", "绿色"),
+        RED("red", "红色"),
         YELLOW("Yellow", "黄色");
 
         private String code;
@@ -3639,4 +3644,40 @@ public class MesPcnEnumUtil {
             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

@@ -6906,4 +6906,64 @@ public class WmsEnumUtil {
             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-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java

@@ -94,4 +94,8 @@ public class IfQcOrder extends BaseBean  implements Serializable {
     @ApiParam("发运时间")
     private String deliveryDate;
 
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检测类型")
+    private Integer checkType;
+
 }

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

@@ -29,7 +29,7 @@ import java.io.Serializable;
 @Api("IF_质检结果")
 public class IfQcResult extends BaseBean  implements Serializable {
 
-    private static final long serialVersionUID = -5412635747424111476L;
+    //private static final long serialVersionUID = -5412635747424111476L;
     @Column(name = "ORDER_NO")
     @ApiParam("质检单号")
     private String orderNo;

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

@@ -63,10 +63,22 @@ public class MesEquipmentTooling extends BaseBean implements Serializable {
     @ApiParam("更换结束时间")
     private String endTime;
 
-    @Transient
-    @ApiParam("最大次数")
+    @Column(name = "USE_COUNT_MAX")
+    @ApiParam("最大使用次数")
     private Integer useCountMax;
 
+    @Column(name = "REMIND_COUNT")
+    @ApiParam("提醒次数")
+    private Integer remindCount;
+
+    @Transient
+    @ApiParam("按钮名称")
+    private String btnName;
+
+    @Transient
+    @ApiParam("按钮颜色")
+    private String btnColor;
+
     public Integer getToolingType() {
         return this.toolingType == null ? 0 : this.toolingType;
     }

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

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.mes.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;
+
+/**
+ * @Description:车型等级
+ * @Reference:
+ * @Author: adair.song
+ * @CreateDate: 2020\05\14 10:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_MODEL_GRADE")
+@Api("MES_车型等级")
+public class MesModelGrade extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -5412635747427364076L;
+
+    @Column(name = "GRADE_CODE")
+    @ApiParam("等级代码")
+    private String gradeCode;
+
+    @Column(name = "GRADE_NAME")
+    @ApiParam("等级名称")
+    private String gradeName;
+
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @Column(name = "GRADE_FLAG_VALUE")
+    @ApiParam("等级标识值")
+    private String gradeFlagValue;
+}

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

@@ -123,4 +123,8 @@ public class MesOee extends BaseBean implements Serializable {
     @Transient
     @ApiParam("自定义数据map")
     private List<MesOperateObjectAttribute> operateObjectAttributes;
+
+    @Transient
+    @ApiParam("手工录入集合")
+    private List<String> attributes;
 }

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

@@ -50,8 +50,4 @@ public class MesOperateObjectAttribute extends BaseBean implements Serializable
     @Transient
     @ApiParam("属性值")
     private String attributeValue;
-
-    @Transient
-    @ApiParam("是否自定义属性")
-    private boolean customAttribute = false;
 }

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

@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.mes.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;
+
+/**
+ * @Description:产品颜色
+ * @Reference:
+ * @Author: adair.song
+ * @CreateDate: 2020\05\14 10:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PART_COLOR")
+@Api("MES_产品颜色")
+public class MesPartColor extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -5412632727837364076L;
+
+    @Column(name = "COLOR_TYPE")
+    @ApiParam("类型")
+    private Integer colorType;
+
+    @Column(name = "COLOR_CODE")
+    @ApiParam("颜色代码")
+    private String colorCode;
+
+    @Column(name = "COLOR_NAME")
+    @ApiParam("颜色名称")
+    private String colorName;
+
+    @Column(name = "IF_COLOR_CODE")
+    @ApiParam("接口颜色代码")
+    private String ifColorCode;
+
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "MODEL_YEAR")
+    @ApiParam("年度型")
+    private String modelYear;
+}

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

@@ -0,0 +1,84 @@
+package cn.estsh.i3plus.pojo.mes.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;
+
+/**
+ * @Description:产品车型配置
+ * @Reference:
+ * @Author: adair.song
+ * @CreateDate: 2020\05\14 15:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PROD_MODEL_CFG")
+@Api("MES_产品车型配置")
+public class MesProdModelCfg extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -5227132727837364076L;
+
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "MODEL_YEAR")
+    @ApiParam("年度型")
+    private String modelYear;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户工厂代码")
+    private String custPlantCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("总成零件号")
+    private String partNo;
+
+    @Column(name = "CUSTOMER_PART_NO")
+    @ApiParam("客户零件号")
+    private String customerPartNo;
+
+    @Column(name = "GRADE_CODE")
+    @ApiParam("等级代码")
+    private String gradeCode;
+
+    @Column(name = "MODEL_FLAG_VALUE")
+    @ApiParam("车型标志值")
+    private String modelFlagValue;
+
+    @Column(name = "MODEL_CFG_FLAG_VALUE")
+    @ApiParam("车型配置标志值")
+    private String modelCfgFlagValue;
+
+    @Column(name = "QC_FLAG_VALUE")
+    @ApiParam("质量标志值")
+    private String qcFlagValue;
+
+    @Column(name = "LABEL_DESC")
+    @ApiParam("条码标签描述")
+    private String labelDesc;
+
+    @Column(name = "CCC_CODE")
+    @ApiParam("3C认证编码")
+    private String cccCode;
+
+    @Column(name = "PROCESS_LABEL_TEMPLATE")
+    @ApiParam("过程标签模板")
+    private String processLabelTemplate;
+}

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

@@ -84,6 +84,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     @ApiParam("间隔时间")
     private Integer checkInterval = 0;
 
+    @Column(name = "IS_CONCESSION")
+    @ApiParam("是否允许让步")
+    private Integer isConcession = 0;
+
     @Transient
     @ApiParam("检测类型名称")
     private String checkTypeName;

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

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mes.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;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\15 10:01
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QC_ORDER_ACCESSORY")
+@Api("MES_检验单附件")
+public class MesQcOrderAccessory extends BaseBean  implements Serializable {
+
+    private static final long serialVersionUID = 2648132773643541110L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("质检单号")
+    private String orderNo;
+
+    @Column(name = "ACCESSORY_NAME")
+    @ApiParam("附件名称")
+    private String accessoryName;
+
+    @Column(name = "ACCESSORY_URL")
+    @ApiParam("附件路径")
+    private String accessoryUrl;
+}

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

@@ -0,0 +1,75 @@
+package cn.estsh.i3plus.pojo.mes.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.ColumnDefault;
+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;
+
+/**
+ * @Description:车型散件配置清单
+ * @Reference:
+ * @Author: adair.song
+ * @CreateDate: 2020\05\14 10:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SCATTER_PART_CFG_BOM")
+@Api("MES_车型散件配置清单")
+public class MesScatterPartCfgBom extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -5412635772834364076L;
+
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "MODEL_YEAR")
+    @ApiParam("年度型")
+    private String modelYear;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户工厂代码")
+    private String custPlantCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name = "CUST_PART_NO")
+    @ApiParam("客户零件号")
+    private String custPartNo;
+
+    @Column(name = "PART_FLAG_LOCATION")
+    @ApiParam("零件标志位")
+    private Integer partFlagLocation;
+
+    @Column(name = "PART_FLAG_VALUE")
+    @ApiParam("零件标志值")
+    private String partFlagValue;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,3)")
+    @ColumnDefault("0")
+    @ApiParam(value = "用量", example = "0")
+    public Double qty;
+
+    @Column(name = "OPTION_TYPE")
+    @ApiParam("选配类型")
+    private Integer optionType;
+}

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

@@ -0,0 +1,149 @@
+package cn.estsh.i3plus.pojo.mes.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;
+
+/**
+ * @Description:散件零件生产配置
+ * @Reference:
+ * @Author: adair.song
+ * @CreateDate: 2020\05\14 10:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SCATTER_PART_PROD_CFG")
+@Api("MES_散件零件生产配置")
+public class MesScatterPartProdCfg extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -5412632727837782394L;
+
+    @Column(name = "CFG_ID")
+    @ApiParam("配置编号")
+    private String cfgId;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "MODEL_FLAG_VALUE")
+    @ApiParam("车型标志值")
+    private String modelFalgValue;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "GRADE_CODE")
+    @ApiParam("等级代码")
+    private String gradeCode;
+
+    @Column(name = "COLOR_CODE")
+    @ApiParam("颜色代码")
+    private String colorCode;
+
+    @Column(name = "PART_FLAG_LOCATION")
+    @ApiParam("标志位")
+    private Integer partFlagLocation;
+
+    @Column(name = "PART_FLAG_VALUE")
+    @ApiParam("标志值")
+    private String partFlagValue;
+
+    @Column(name = "POKE_YOKE_FIX")
+    @ApiParam("防错码")
+    private String pokeYokeFix;
+
+    @Column(name = "POKE_YOKE_FROM")
+    @ApiParam("防错码开始位")
+    private Integer pokeYokeFrom;
+
+    @Column(name = "POKE_YOKE_END")
+    @ApiParam("防错码结束位")
+    private Integer pokeYokeEnd;
+
+    @Column(name = "POKE_YOKE_LENGTH")
+    @ApiParam("防错码长度")
+    private Integer pokeYokeLength;
+
+    @Column(name = "PEST1")
+    @ApiParam("PEST编码1")
+    private Integer pest1;
+
+    @Column(name = "PEST2")
+    @ApiParam("PEST编码2")
+    private Integer pest2;
+
+    @Column(name = "PEST3")
+    @ApiParam("PEST编码3")
+    private Integer pest3;
+
+    @Column(name = "PEST4")
+    @ApiParam("PEST编码4")
+    private Integer pest4;
+
+    @Column(name = "PEST5")
+    @ApiParam("PEST编码5")
+    private Integer pest5;
+
+    @Column(name = "PEST6")
+    @ApiParam("PEST编码6")
+    private Integer pest6;
+
+    @Column(name = "PEST7")
+    @ApiParam("PEST编码7")
+    private Integer pest7;
+
+    @Column(name = "PEST8")
+    @ApiParam("PEST编码8")
+    private Integer pest8;
+
+    @Column(name = "TORQUE_NO")
+    @ApiParam("扭矩枪编号")
+    private String torqueNo;
+
+    @Column(name = "IS_PF")
+    @ApiParam("是否大枪")
+    private Integer isPf;
+
+    @Column(name = "POKE_TYKE_SEQ")
+    @ApiParam("防错顺序")
+    private Integer pokeTypeSeq;
+
+    @Column(name = "EFF_START_TIME")
+    @ApiParam("有效起始日期")
+    private String effStartTime;
+
+    @Column(name = "EFF_END_TIME")
+    @ApiParam("有效截至日期")
+    private String effEndTime;
+
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+}

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

@@ -11,6 +11,7 @@ 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;
 
 /**
@@ -30,7 +31,7 @@ import java.io.Serializable;
 public class MesTooling extends BaseBean implements Serializable {
     private static final long serialVersionUID = -5033127912658757665L;
 
-    @Column(name = "TOOLING_CODE ")
+    @Column(name = "TOOLING_CODE")
     @ApiParam("工装代码")
     private String toolingCode ;
 
@@ -49,4 +50,12 @@ public class MesTooling extends BaseBean implements Serializable {
     @Column(name = "USE_TIME_MAX")
     @ApiParam("最大使用时间")
     private String useTimeMax;
+
+    @Column(name = "REMIND_COUNT")
+    @ApiParam("提醒次数")
+    private Integer remindCount;
+
+    @Transient
+    @ApiParam("使用次数")
+    private Integer useCount;
 }

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

@@ -0,0 +1,75 @@
+package cn.estsh.i3plus.pojo.mes.bean.template;
+
+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.util.List;
+
+/**
+ * @Description : 导入模板信息
+ * @Reference :
+ * @Author : adair.song --复用--> siliter.yuan
+ * @CreateDate : 2020-05-18 16:49
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BAS_IMPORT_TEMPLATE")
+@Api("导入模板信息")
+public class BasImportTemplate extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592889L;
+    @Column(name="TEMPLATE_CODE")
+    @ApiParam("模板代码")
+    private String templateCode;
+
+    @Column(name="TEMPLATE_NAME")
+    @ApiParam("模板名称")
+    private String templateName;
+
+    @Column(name="TEMPLATE_DESC")
+    @ApiParam("模板描述")
+    private String templateDesc;
+
+    @Column(name="GROUP_NAME")
+    @ApiParam("分组名称")
+    private String groupName;
+
+    /**
+     * 10-单表，20-多表
+     */
+    @Column(name="IMPORT_TYPE")
+    @ApiParam(value = "导入类型", example = "0")
+    private Integer importType;
+
+    /**
+     *  10-全覆盖，20-差异更新，30-重复不导入
+     */
+    @Column(name="UPDATE_TYPE")
+    @ApiParam(value = "更新类型", example = "0")
+    private Integer updateType;
+
+    @Column(name="SCRIPT_NO")
+    @ApiParam("脚本编号")
+    private String scriptNo;
+
+    @Column(name="START_ROW")
+    @ApiParam(value = "起始行", example = "0")
+    private Integer startRow;
+
+    @Transient
+    @ApiParam("模板明细列表")
+    private List<BasImportTemplateDetails> templateDetailsList;
+}

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

@@ -0,0 +1,117 @@
+package cn.estsh.i3plus.pojo.mes.bean.template;
+
+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;
+
+/**
+ * @Description : 导入模板明细信息
+ * @Reference :
+ * @Author : adair.song --复用--> siliter.yuan
+ * @CreateDate : 2020-05-18 16:49
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BAS_IMPORT_TEMPLATE_DETAILS")
+@Api("导入模板明细信息")
+public class BasImportTemplateDetails extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592999L;
+    @Column(name="TEMPLATE_CODE")
+    @ApiParam("模板代码")
+    private String templateCode;
+
+    @Column(name="TABLE_NAME")
+    @ApiParam("表名称")
+    private String tableName;
+
+    @Column(name="FIELD_CODE")
+    @ApiParam("字段英文名称")
+    private String fieldCode;
+
+    @Column(name="FIELD_ALIAS")
+    @ApiParam("字段别名")
+    private String fieldAlias;
+
+    @Column(name="LABEL_CODE")
+    @ApiParam("标签代码")
+    private String labelCode;
+
+    @Column(name="LABEL_NAME")
+    @ApiParam("标签名称")
+    private String labelName;
+
+    @Column(name="DEFAULT_VALUE")
+    @ApiParam("默认值")
+    private String defaultValue;
+
+    /**
+     * 数据格式 文本、整数、小数、日期
+     */
+    @Column(name="DATA_FORAMT")
+    @ApiParam("数据格式")
+    private String dataFormat;
+
+    /**
+     *  1-是，2-否
+     */
+    @Column(name="IS_REQUIRE")
+    @ApiParam(value = "是否必填", example = "0")
+    private Integer isRequire;
+
+    @Column(name="DECIMAIL_SPLIT")
+    @ApiParam("小数点分隔符")
+    private String decimalSplit;
+
+    @Column(name="THOUSANDS_SPLIT")
+    @ApiParam("千分位分隔符")
+    private String thousandsSplit;
+
+    // YYYY-MM-DD/DD-MM-YY/YYYY-MM-DD HH:mm:ss
+    @Column(name="DATE_FORMAT")
+    @ApiParam("日期格式")
+    private String dateFormat;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name="SEQ")
+    @ApiParam(value = "序号", example = "0")
+    private Integer seq;
+
+    @Column(name="MAX_LENGTH")
+    @ApiParam(value = "最大长度", example = "0")
+    private Integer maxLength;
+
+    @Column(name="RELATION_TABLE")
+    @ApiParam("关联表名")
+    private String relationTable;
+
+    @Column(name="RELATION_FIELD")
+    @ApiParam("关联字段")
+    private String relationField;
+
+    /**
+     * 是否主键 1-是，2-否
+     */
+    @Column(name="IS_PK")
+    @ApiParam(value = "是否主键", example = "0")
+    private Integer isPk;
+
+    @Column(name="SHEET_NAME")
+    @ApiParam("工作薄名称")
+    private String sheetName;
+}

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

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @description 数据库实例字段模型
+ * @author adair.song --复用--> siliter.yuan
+ * @CreateDate : 2020-05-18 16:49
+ */
+@Data
+@Api("数据库实例字段模型")
+public class BasBeanFieldModel {
+
+    @ApiParam("表名")
+    private String tableName;
+
+    @ApiParam("表描述")
+    private String tableDesc;
+
+    @ApiParam("字段英文名称")
+    private String fieldEnName;
+
+    @ApiParam("字段类型")
+    public String fieldType;
+
+    @ApiParam("字段描述")
+    private String fieldDesc;
+
+    @ApiParam("实例类名")
+    public String entityName;
+
+    @ApiParam("实例字段名称")
+    public String propertyName;
+
+    @ApiParam("实例类全名")
+    public String entityClassName;
+}

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

@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/5/18 5:10 下午
+ * @Modify:
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PartStockScheduleModel {
+
+    private String partNo;
+
+    private Integer boxQty;
+
+    private Double qty;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateDetailsRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 导入模板明细数据操作仓库
+ * @Reference :
+ * @Author : adair.song --复用--> siliter.yuan
+ * @CreateDate : 2020-05-18 16:49
+ * @Modify:
+ **/
+@Repository
+public interface BasImportTemplateDetailsRepository extends BaseRepository<BasImportTemplateDetails, Long> {
+    
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BasImportTemplateRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 导入模板数据操作仓库
+ * @Reference :
+ * @Author : adair.song --复用--> siliter.yuan
+ * @CreateDate : 2020-05-18 16:49
+ * @Modify:
+ **/
+@Repository
+public interface BasImportTemplateRepository extends BaseRepository<BasImportTemplate, Long> {
+    
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesModelGradeRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesModelGrade;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : adair.song
+ * @CreateDate : 2020-05-15
+ * @Modify:
+ **/
+@Repository
+public interface MesModelGradeRepository extends BaseRepository<MesModelGrade, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartColorRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartColor;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : adair.song
+ * @CreateDate : 2020-05-15
+ * @Modify:
+ **/
+@Repository
+public interface MesPartColorRepository extends BaseRepository<MesPartColor, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdModelCfgRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProdModelCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : adair.song
+ * @CreateDate : 2020-05-15
+ * @Modify:
+ **/
+@Repository
+public interface MesProdModelCfgRepository extends BaseRepository<MesProdModelCfg, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderAccessoryRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderAccessory;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesQcOrderAccessoryRepository extends BaseRepository<MesQcOrderAccessory, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartCfgBomRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesScatterPartCfgBom;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : adair.song
+ * @CreateDate : 2020-05-15
+ * @Modify:
+ **/
+@Repository
+public interface MesScatterPartCfgBomRepository extends BaseRepository<MesScatterPartCfgBom, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterPartProdCfgRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesScatterPartProdCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : adair.song
+ * @CreateDate : 2020-05-15
+ * @Modify:
+ **/
+@Repository
+public interface MesScatterPartProdCfgRepository extends BaseRepository<MesScatterPartProdCfg, Long> {
+}

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

@@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
+import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
+import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
 import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
 import org.springframework.util.StringUtils;
 
@@ -2720,4 +2722,169 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * MES 车型等级查询条件封装
+     *
+     * @param modelGrade
+     * @return
+     */
+    public static DdlPackBean getMesModelGrade(MesModelGrade modelGrade, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(modelGrade, organizeCode);
+        if (!StringUtils.isEmpty(modelGrade.getGradeCode())) {
+            DdlPreparedPack.getStringEqualPack(modelGrade.getGradeCode(), "gradeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(modelGrade.getGradeName())) {
+            DdlPreparedPack.getStringLikerPack(modelGrade.getGradeName(), "gradeName", packBean);
+        }
+        if (!StringUtils.isEmpty(modelGrade.getGradeFlagValue())) {
+            DdlPreparedPack.getStringLikerPack(modelGrade.getGradeFlagValue(), "gradeFlagValue", packBean);
+        }
+        if (!StringUtils.isEmpty(modelGrade.getProdCfgTypeCode())) {
+            DdlPreparedPack.getStringEqualPack(modelGrade.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 产品颜色查询条件封装
+     *
+     * @param partColor
+     * @return
+     */
+    public static DdlPackBean getMesPartColor(MesPartColor partColor, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(partColor, organizeCode);
+        if (!StringUtils.isEmpty(partColor.getColorCode())) {
+            DdlPreparedPack.getStringEqualPack(partColor.getColorCode(), "colorCode", packBean);
+        }
+        if (!StringUtils.isEmpty(partColor.getColorName())) {
+            DdlPreparedPack.getStringLikerPack(partColor.getColorName(), "colorName", packBean);
+        }
+        if (!StringUtils.isEmpty(partColor.getIfColorCode())) {
+            DdlPreparedPack.getStringEqualPack(partColor.getIfColorCode(), "ifColorCode", packBean);
+        }
+        if (!StringUtils.isEmpty(partColor.getProdCfgTypeCode())) {
+            DdlPreparedPack.getStringEqualPack(partColor.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(partColor.getProduceCtgyCode())) {
+            DdlPreparedPack.getStringEqualPack(partColor.getProduceCtgyCode(), "produceCtgyCode", packBean);
+        }
+        if (!StringUtils.isEmpty(partColor.getModelYear())) {
+            DdlPreparedPack.getStringEqualPack(partColor.getModelYear(), "modelYear", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 产品车型配置
+     *
+     * @param prodModelCfg
+     * @return
+     */
+    public static DdlPackBean getMesProdModelCfg(MesProdModelCfg prodModelCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(prodModelCfg, organizeCode);
+        if (!StringUtils.isEmpty(prodModelCfg.getProdCfgTypeCode())) {
+            DdlPreparedPack.getStringEqualPack(prodModelCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(prodModelCfg.getProduceCtgyCode())) {
+            DdlPreparedPack.getStringEqualPack(prodModelCfg.getProduceCtgyCode(), "produceCtgyCode", packBean);
+        }
+        if (!StringUtils.isEmpty(prodModelCfg.getModelYear())) {
+            DdlPreparedPack.getStringLikerPack(prodModelCfg.getModelYear(), "modelYear", packBean);
+        }
+        if (!StringUtils.isEmpty(prodModelCfg.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(prodModelCfg.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(prodModelCfg.getGradeCode())) {
+            DdlPreparedPack.getStringEqualPack(prodModelCfg.getGradeCode(), "gradeCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 车型散件配置清单
+     *
+     * @param scatterPartCfgBom
+     * @return
+     */
+    public static DdlPackBean getMesScatterPartCfgBom(MesScatterPartCfgBom scatterPartCfgBom, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(scatterPartCfgBom, organizeCode);
+        if (!StringUtils.isEmpty(scatterPartCfgBom.getProdCfgTypeCode())) {
+            DdlPreparedPack.getStringEqualPack(scatterPartCfgBom.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(scatterPartCfgBom.getProduceCtgyCode())) {
+            DdlPreparedPack.getStringEqualPack(scatterPartCfgBom.getProduceCtgyCode(), "produceCtgyCode", packBean);
+        }
+        if (!StringUtils.isEmpty(scatterPartCfgBom.getModelYear())) {
+            DdlPreparedPack.getStringLikerPack(scatterPartCfgBom.getModelYear(), "modelYear", packBean);
+        }
+        if (!StringUtils.isEmpty(scatterPartCfgBom.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(scatterPartCfgBom.getPartNo(), "partNo", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 散件零件生产配置
+     *
+     * @param scatterPartProdCfg
+     * @return
+     */
+    public static DdlPackBean getMesScatterPartProdCfg(MesScatterPartProdCfg scatterPartProdCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(scatterPartProdCfg, organizeCode);
+        if (!StringUtils.isEmpty(scatterPartProdCfg.getCfgId())) {
+            DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getCfgId(), "cfgId", packBean);
+        }
+        if (!StringUtils.isEmpty(scatterPartProdCfg.getWorkCenterCode())) {
+            DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(scatterPartProdCfg.getWorkCellCode())) {
+            DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (!StringUtils.isEmpty(scatterPartProdCfg.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(scatterPartProdCfg.getPartName())) {
+            DdlPreparedPack.getStringLikerPack(scatterPartProdCfg.getPartName(), "partName", packBean);
+        }
+        if (!StringUtils.isEmpty(scatterPartProdCfg.getGradeCode())) {
+            DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getGradeCode(), "gradeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(scatterPartProdCfg.getColorCode())) {
+            DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getColorCode(), "colorCode", packBean);
+        }
+        if (!StringUtils.isEmpty(scatterPartProdCfg.getProdCfgTypeCode())) {
+            DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(scatterPartProdCfg.getProduceCtgyCode())) {
+            DdlPreparedPack.getStringEqualPack(scatterPartProdCfg.getProduceCtgyCode(), "produceCtgyCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 导入模板信息分页查询条件
+     * @param template
+     * @return
+     */
+    public static DdlPackBean packHqlBasImportTemplate(BasImportTemplate template) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(template.getTemplateName(), "templateName", result);
+        DdlPreparedPack.getStringEqualPack(template.getTemplateCode(), "templateCode", result);
+        DdlPreparedPack.getStringEqualPack(template.getGroupName(), "groupName", result);
+        getStringBuilderPack(template, result);
+        return result;
+    }
+
+    /**
+     * 导入模板明细信息分页查询条件
+     * @param details
+     * @return
+     */
+    public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result);
+        getStringBuilderPack(details, result);
+        return result;
+    }
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java

@@ -7,7 +7,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 import java.io.Serializable;
-import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.Objects;
 
@@ -41,7 +40,7 @@ public class ImppLicense implements Serializable {
 
     /* 基础信息 */
     @ApiParam(value ="授权ID")
-    private Long Id;                            // ID
+    private Long id;                            // ID
     @ApiParam(value ="授权应用ID")
     private Long appId;                         // APP_ID
     @ApiParam(value ="授权读取授权数据ID")
@@ -70,6 +69,28 @@ public class ImppLicense implements Serializable {
     @ApiParam(value ="深思授权信息")
     private ImppLicenseSenseshield senseshield;
 
+    /* 备用预留字段 */
+    @ApiParam(value ="备用字段")
+    private String licenseSpare01;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare02;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare03;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare04;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare05;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare06;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare07;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare08;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare09;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare10;
+
     /* 业务人员信息 */
     @ApiParam(value ="授权创建时间")
     private Date licenseCreateDateTime;         // 授权时间
@@ -92,6 +113,7 @@ public class ImppLicense implements Serializable {
     @ApiParam(value ="锁类型")
     private String lockType;
 
+
     /* 基础业务逻辑 */
     @ApiParam(value ="到期时间")
     private String maturityDateTime;

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.model.mes;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description : Wms实体字段Model信息
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-04-24 09:53
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+public class BasBeanFieldInfoModel implements Serializable {
+
+    private static final long serialVersionUID = -6376845639646448895L;
+
+    @ApiParam(value = "表名称")
+    public String tableName;
+
+    @ApiParam(value = "表字段名称")
+    private String fieldName;
+
+    @ApiParam(value = "表字段描述")
+    private String fieldDesc;
+
+    @ApiParam(value = "表字段类型")
+    private String fieldType;
+
+    @ApiParam(value = "主键")
+    private String isFieldPrimaryKey;
+
+    @ApiParam(value = "非空")
+    private String isFieldNull;
+
+    @ApiParam(value = "外键")
+    private String isFieldForeignKey;
+
+    @ApiParam(value = "唯一约束")
+    private String isFieldUnique;
+
+    @ApiParam(value = "自增")
+    private String isFieldGeneric;
+}

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.model.mes;
+
+import cn.estsh.i3plus.pojo.model.mes.BasBeanFieldInfoModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : Wms实体字段Model信息
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-04-24 09:53
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+public class BasBeanInfoModel implements Serializable {
+
+    private static final long serialVersionUID = -6376845639646448495L;
+
+    @ApiParam(value = "系统名称")
+    public String systemName;
+
+    @ApiParam(value = "实体名称")
+    public String entityName;
+
+    @ApiParam(value = "数据表名称")
+    private String tableName;
+
+    @ApiParam(value = "数据表描述")
+    private String tableDesc;
+
+    @ApiParam(value = "字段列表数据")
+    private List<BasBeanFieldInfoModel> fieldInfoModelList;
+}

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

@@ -43,4 +43,7 @@ public class ExcelImportModel<T> implements Serializable {
     @ApiParam("导入进度")
     private String importSpeed;
 
+    @ApiParam("Sheet名称")
+    private String sheetName;
+
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java

@@ -1,41 +0,0 @@
-package cn.estsh.i3plus.pojo.model.wms;
-
-
-import cn.estsh.i3plus.pojo.model.mes.ImportErrorModel;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * @Author: siliter.yuan
- * @CreateDate: 2020/4/21 9:19 AM
- * @Description:
- **/
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Api("导入结果model")
-public class ExcelImportModel implements Serializable {
-
-    private static final long serialVersionUID = 1444427447244864339L;
-    @ApiParam("结果")
-    private boolean result;
-
-    @ApiParam("成功行数量")
-    private int successRowNum;
-
-    @ApiParam("工作薄名称")
-    private String sheetName;
-
-    @ApiParam("导入数据集合")
-    private List<ConcurrentHashMap<String, Object>> excelList;
-
-    @ApiParam("错误信息集合")
-    private List<ImportErrorModel> ImportErrorModels;
-}