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

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @Table(name = "ANDON_ACTION_MODULE")
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("作业组件")
 public class AndonActionModule extends BaseBean implements Serializable {
 

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @Table(name = "ANDON_ACTION_MODULE_GROUP")
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("组件集")
 public class AndonActionModuleGroup extends BaseBean implements Serializable {
 

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @Table(name = "ANDON_ACTION_MODULE_PARAM")
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("组件参数")
 public class AndonActionModuleParam extends BaseBean implements Serializable {
 

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @Table(name = "ANDON_ACTION_ROUTE")
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("作业流程")
 public class AndonActionRoute extends BaseBean implements Serializable {
 

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @Table(name = "ANDON_ACTOR")
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("ACTOR信息")
 public class AndonActor extends BaseBean implements Serializable {
 

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @Table(name = "ANDON_ACTOR_RULE")
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("ACTOR消息类型配置")
 public class AndonActorRule extends BaseBean implements Serializable {
 

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -29,6 +31,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api(value = "ANDON_呼叫原因")
 public class AndonAlarmCause extends BaseBean implements Serializable {
 

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -28,6 +30,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("安灯子类型")
 public class AndonAlarmDetailType extends BaseBean implements Serializable {
 

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -28,6 +30,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("ANDON_呼叫通知配置")
 public class AndonAlarmResponseCfg extends BaseBean  implements Serializable {
 

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @Table(name = "ANDON_ALARM_ROUTE")
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("安灯作业流程配置")
 public class AndonAlarmRoute extends BaseBean implements Serializable {
 

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @Table(name = "ANDON_ALARM_ROUTE_MODULE_PARAM")
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("安灯作业流程组件参数")
 public class AndonAlarmRouteModuleParam extends BaseBean implements Serializable {
 

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @Table(name = "ANDON_ALARM_TYPE")
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("安灯类型")
 public class AndonAlarmType extends BaseBean implements Serializable {
 

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @Table(name = "ANDON_AREA_ALARM_TYPE")
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("区域安灯类型")
 public class AndonAreaAlarmType extends BaseBean implements Serializable {
 

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name="ANDON_BROADCAST")
 @Api("安灯广播")
 public class AndonBroadCast extends BaseBean implements Serializable {

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -29,6 +31,7 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name="ANDON_BROADCAST_CFG")
 @Api("生产区域")
 public class AndonBroadCastCfg extends BaseBean implements Serializable {

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -29,6 +31,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("ANDON_工作单元呼叫原因配置")
 public class AndonCellAlarmCause extends BaseBean  implements Serializable {
 

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -29,6 +31,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("ANDON_工作单元事件原因配置")
 public class AndonCellEventCause extends BaseBean implements Serializable {
 

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -29,6 +31,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("ANDON_工作单元处理方法配置")
 public class AndonCellEventMethod extends BaseBean implements Serializable {
 

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("ANDON_工作单元事件现象")
 public class AndonCellEventPhenomenon extends BaseBean implements Serializable {
 

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.Interceptor;
 import org.hibernate.annotations.DynamicInsert;
@@ -29,6 +31,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("ANDON_工位分组配置")
 public class AndonCellGroupCfg extends BaseBean implements Serializable {
 

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name="ANDON_CONFIG")
 @Api(value="系统配置")
 public class AndonConfig extends BaseBean implements Serializable {

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -29,6 +31,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("ANDON_自处理配置")
 public class AndonDisposalCfg extends BaseBean implements Serializable {
 

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

@@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -29,6 +31,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("Andon自处理维护配置")
 public class AndonDisposalMaintenCfg extends BaseBean implements Serializable {
 

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -29,6 +31,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api(value = "ANDON_事件原因")
 public class AndonEventCause extends BaseBean implements Serializable {
 

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -29,6 +31,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api(value = "ANDON_事件处理方法")
 public class AndonEventMethod extends BaseBean implements Serializable {
 

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -29,6 +31,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("ANDON_事件现象")
 public class AndonEventPhenoMenon extends BaseBean implements Serializable {
 

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -34,6 +36,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("安灯队列")
 public class AndonHaltCfg extends BaseBean implements Serializable {
 

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("ANDON_停机类型")
 public class AndonHaltType extends BaseBean implements Serializable {
 

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("ANDON知识库")
 public class AndonKnowledgeBase extends BaseManageQueue implements Serializable {
 

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

@@ -8,6 +8,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.beanutils.BeanUtils;
 import org.hibernate.annotations.DynamicInsert;
@@ -41,6 +43,7 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("安灯队列")
 public class AndonManageQueue extends BaseManageQueue implements Serializable {
 

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

@@ -7,6 +7,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -36,6 +38,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("去去去去去去去去去安灯记录")
 public class AndonManageRecord extends BaseManageQueue implements Serializable {
 

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("通知记录")
 public class AndonMessageRecord extends BaseBean implements Serializable {
 

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @Table(name = "ANDON_MESSAGE_TYPE")
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("消息类型")
 public class AndonMessageType extends BaseBean implements Serializable {
 

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

@@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -30,6 +32,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("安灯PLC控制")
 public class AndonPLC extends BaseBean implements Serializable {
 

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -34,6 +36,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("安灯PLC监控记录")
 public class AndonPLCRecord extends BaseBean implements Serializable {
 

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name="ANDON_PLC_COLOR_CFG")
 @Api(value="PLC三色灯控制")
 public class AndonPlcColorCfg extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name="ANDON_MANAGE_ATTACH")
 @Api(value="安灯附属表")
 public class AndonQueueAttach extends BaseBean implements Serializable {

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -28,6 +30,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("通知方式")
 public class AndonResponse extends BaseBean implements Serializable {
 

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -28,6 +30,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("安灯通知对象")
 public class AndonResponseObject extends BaseBean implements Serializable {
 

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -28,6 +30,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("ANDON_上升流程配置")
 public class AndonRiteRoute extends BaseBean  implements Serializable {
 

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -28,6 +30,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("ANDON_上升配置明细")
 public class AndonRiteRouteDetail extends BaseBean  implements Serializable {
 

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @Table(name = "ANDON_ROUTE_MODULE_PARAM")
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("流程组件参数")
 public class AndonRouteModuleParam extends BaseBean implements Serializable {
 

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -27,6 +29,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @Table(name = "ANDON_ROUTE_STATUS")
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("流程状态")
 public class AndonRouteStatus extends BaseBean implements Serializable {
 

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -22,6 +24,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @Table(name = "ANDON_ROUTE_STATUS_ERROR_RECORD")
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Api("流程状态异常记录")
 public class AndonRouteStatusErrorRecord extends BaseBean implements Serializable {
 

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

@@ -8,6 +8,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -31,6 +33,7 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name="MES_AREA")
 @Api("生产区域")
 public class MesArea extends BaseBean implements Serializable {

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

@@ -9,6 +9,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -31,6 +33,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name="MES_EQUIPMENT")
 @Api("生产设备")
 public class MesEquipment extends BaseBean implements Serializable {

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name="MES_SHIFT")
 @Api("班次信息")
 public class MesShift extends BaseBean implements Serializable {

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

@@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -30,6 +32,7 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_WORK_CELL")
 @Api("工作单元")
 public class MesWorkCell extends BaseBean implements Serializable {

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

@@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -30,6 +32,7 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_WORK_CENTER")
 @Api("工作中心")
 public class MesWorkCenter extends BaseBean implements Serializable {

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

@@ -89,8 +89,9 @@ public class AndonEnumUtil {
         QUALITY_ALARM_CALL("QUALITY_ALARM_CALL", "质量呼叫弹框界面"),
         PART_ALARM_CALL("PART_ALARM_CALL", "物料呼叫弹框界面"),
         ROUTING_ALARM_CALL("ROUTING_ALARM_CALL", "工艺呼叫弹框界面"),
-        OTHER_ALARM_CALL("OTHER_ALARM_CALL", "自处理呼叫弹框界面"),
+        OTHER_ALARM_CALL("OTHER_ALARM_CALL", "工装呼叫弹框界面"),
         FIX_ERROR_CALL("FIX_ERROR_CALL", "自动报警呼叫弹框界面"),
+        MODULE_ALARM_CALL("MODULE_ALARM_CALL", "模具呼叫弹框界面"),
         ALARM_SIGN("ALARM_SIGN", "响应弹框界面"),
         ALARM_CANCEL("ALARM_CANCEL", "撤销二次提醒框"),
         ALARM_RESOLVE("ALARM_RESOLVE", "解决弹框界面");
@@ -1218,7 +1219,8 @@ public class AndonEnumUtil {
         PART("PART_ALARM", 110060104, "物料", "#24BDBA"),
         PROCESS("ROUTING_ALARM", 110060107, "工艺", "#2B97F9"),
         CHECK("OTHER_ALARM", 110060108, "工装", "#EAA510"),
-        FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F");
+        FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F"),
+        MOULD("MOULD_ALARM", 160060111, "模具", "#0A8BEE");
 
         private String value;
         private Integer code;

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

@@ -1081,7 +1081,8 @@ public class ImppEnumUtil {
         BASIS(5, "基础"),
         CONFIG(6, "系统配置"),
         LOG(7, "日志配置"),
-        WORK_WECHAT(8, "企业微信配置");
+        WORK_WECHAT(8, "企业微信配置"),
+        SMS(9, "短信配置");
 
         private int value;
         private String description;
@@ -1471,4 +1472,170 @@ public class ImppEnumUtil {
             return null;
         }
     }
+
+    /**
+     * 短信供应商
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SMS_SUPPLIER {
+
+        ALI_CLOUD(1, "阿里云");
+
+        private int value;
+        private String description;
+
+        SMS_SUPPLIER() {
+        }
+
+        SMS_SUPPLIER(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 SMS_SUPPLIER valueOf(int val) {
+            SMS_SUPPLIER tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 短信模板状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SMS_TEMPLATE_STATUS {
+        UNDER_REVIEW(10, "审核中"),
+        PASS(20, "审核通过"),
+        FAIL(30, "审核失败");
+
+        private int value;
+        private String description;
+
+        SMS_TEMPLATE_STATUS() {
+        }
+
+        SMS_TEMPLATE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 短信模板类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SMS_TEMPLATE_TYPE {
+        VER_CODE(10, "验证码"),
+        NOTICE_SMS(20, "短信通知"),
+        PROMOTE_SMS(30, "推广短信"),
+        INTL_SMS(40, "国际/港澳台消息");
+
+        private int value;
+        private String description;
+
+        SMS_TEMPLATE_TYPE() {
+        }
+
+        SMS_TEMPLATE_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;
+        }
+    }
+
+    /**
+     * 短信发送状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SMS_SEND_STATUS {
+        WAIT_RECEIPT(10, "等待回执"),
+        FAIL(20, "发送失败"),
+        SUCCESS(30, "发送成功");
+
+        private int value;
+        private String description;
+
+        SMS_SEND_STATUS() {
+        }
+
+        SMS_SEND_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -2056,7 +2056,7 @@ public class MesEnumUtil {
         MES_SHIFT(180, "shiftExcelService", "班次，支持编辑"),
         MES_SHIFT_GROUP(190, "shiftGroupExcelService", "班组，支持编辑"),
         MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelService", "工作单元参数配置"),
-        MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表"),
+        MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表，支持编辑"),
         MES_DATA_OBJECT(220, "dataObjectExcelService", "数据对象"),
         MES_OBJECT_CFG(230, "objectCfgExcelService", "对象结构"),
         MES_WC_CHECK(240, "wcCheckExcelService", "开线检查，支持编辑"),
@@ -2813,6 +2813,15 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+
+        public static MES_QC_CHECK_TYPE getByValue(int value) {
+            for (MES_QC_CHECK_TYPE type : values()) {
+                if (type.getValue() == value) {
+                    return type;
+                }
+            }
+            return null;
+        }
     }
 
     /**
@@ -7705,6 +7714,15 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+
+        public static QC_CHECK_DATA_SOURCE getByValue(int value) {
+            for (QC_CHECK_DATA_SOURCE type : values()) {
+                if (type.getValue() == value) {
+                    return type;
+                }
+            }
+            return null;
+        }
     }
 
     /**
@@ -8179,4 +8197,95 @@ public class MesEnumUtil {
         }
     }
 
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCT_PROCESS_CHECK_RESULT_TYPE {
+        YELLOW(5, "进行中"),
+        GREEN(10, "合格"),
+        RED(20, "不合格");
+
+        private int value;
+        private String description;
+
+        PRODUCT_PROCESS_CHECK_RESULT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            return value + "";
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static MesEnumUtil.PRODUCT_PROCESS_CHECK_RESULT_TYPE getByValue(Integer value) {
+            for (MesEnumUtil.PRODUCT_PROCESS_CHECK_RESULT_TYPE showSupplierCode : values()) {
+                if (showSupplierCode.getValue() == value) {
+                    return showSupplierCode;
+                }
+            }
+            return null;
+        }
+
+        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 DELIVER_ORDER_MOVE_TYPE {
+        SHIPING(10, "发运"),
+        ALLOCATION(20, "发运&调拨");
+
+        private int value;
+        private String description;
+
+        DELIVER_ORDER_MOVE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static MesEnumUtil.DELIVER_ORDER_MOVE_TYPE getByValue(Integer value) {
+            for (MesEnumUtil.DELIVER_ORDER_MOVE_TYPE showSupplierCode : values()) {
+                if (showSupplierCode.getValue() == value) {
+                    return showSupplierCode;
+                }
+            }
+            return null;
+        }
+
+        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 int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            return value + "";
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

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

@@ -18,7 +18,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PART_CHECK_DATA_TYPE {
         ALL_DATA(1, "所有数据"),
-        LAST_DATA(2, "最后一条数据");
+        LAST_DATA(2, "最后一条数据"),
+        ALL_DATA_AND_LAST_DATA(3, "所有数据且最后一条数据必须合格");
 
         private int value;
         private String description;
@@ -354,7 +355,7 @@ public class MesPcnEnumUtil {
         PCN_LOGOUT(190, "PCN_LOGOUT", ""),
         UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"),
         PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""),
-        PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"),
+        PCN_SYS_ALL_LANGUAGE_URL(220, "PCN_SYS_ALL_LANGUAGE_URL", "PCN_SYS_ALL_LANGUAGE_URL"),
         PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"),
         SYNC_PHOTO_COLLECT_URL(240, "SYNC_PHOTO_COLLECT_URL", "PCN推送图片采集数据至mes");
 
@@ -1459,7 +1460,8 @@ public class MesPcnEnumUtil {
     public enum WC_CHECK_TYPE {
         MATERIAL(10, "MATERIAL", "物料"),
         ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号"),
-        WORK_ORDER(30, "WORK_ORDER", "工单信息");
+        WORK_ORDER(30, "WORK_ORDER", "工单信息"),
+        CLOSE(40, "CLOSE", "关闭开线检查");
 
         private int value;
         private String code;
@@ -4230,6 +4232,7 @@ public class MesPcnEnumUtil {
     public enum PRODUCE_ERROR_RECORD {
         JUMP_PROCESS(10, "跳过工序"),
         JUMP_STEP(20, "跳过工步"),
+        JUMP_STEP_IN_STATE(25, "跳过状态点中的工步"),
         JUMP_STATE(30, "跳过状态点"),
         ABNORMAL_DEDUCTION(40, "扣减异常"),
         REDO_STATION(50, "工位重做"),
@@ -6067,4 +6070,32 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * MesWorkCellJumpRecord 跳过类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_WORK_CELL_JUMP_TYPE {
+
+        SERIAL_SN(10, "过程条码"),
+        PRODUCT_SN(20, "产品条码"),
+        PACK_SN(30, "包装条码"),
+        OTHER(40, "其他");
+
+        private int value;
+        private String description;
+
+        MES_WORK_CELL_JUMP_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

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

@@ -801,7 +801,7 @@ public class WmsEnumUtil {
         SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"),
         SCATTERED_IN(60, "SCATTERED_IN", "零星入库"),
         NC_WAREHOSING_IN(70, "NC_WAREHOSING", "NC入库"),
-        SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"),//默认DMR
+        SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货(DMR)"),//默认DMR
         CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"),
         PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"),
         INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"),
@@ -871,7 +871,9 @@ public class WmsEnumUtil {
         OTHER_OUT(740, "OTHER_OUT", "其它出库"),
         COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"),
         SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"),
-        COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库");//默认DMR
+        COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库"),//默认DMR
+        PRODUCT_IN_STOCK(780, "PRODUCT_IN_STOCK", "成品入库"),
+        SUSPECT_IN_STOCK(790, "SUSPECT_IN_STOCK", "可疑品入库");//默认DMR
 
         private int value;
         private String code;
@@ -1656,6 +1658,11 @@ public class WmsEnumUtil {
             return description;
         }
 
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+
         public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -2481,7 +2488,8 @@ public class WmsEnumUtil {
         TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"),
         BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象"),
         BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"),
-        BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象");
+        BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象"),
+        PDA_BTN(90, "PDA_BTN", "PDA按钮");
 
         private String code;
         private String description;
@@ -5142,6 +5150,59 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 生产工单类型
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_PLAN_TYPE {
+        REPORT(10, "REPORT", "生产报工"),
+        PACKING(20, "PACKING", "打箱包装");
+
+        private int value;
+        private String code;
+        private String description;
+
+        WORK_ORDER_PLAN_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;
+        }
+    }
+
     /**
      * 是否贵重物料
      * 默认为2
@@ -9436,6 +9497,132 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * 报废类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SCRAP_TYPE {
+        ISOLATED_SCRAP(10, "ISOLATED", "隔离报废"),
+        AUTO_SCRAP(20, "AUTO_SCRAP", "自动报废");
+
+        private int value;
+        private String code;
+        private String description;
+
+        SCRAP_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * PDA_BTN
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PDA_BTN {
+        CLEAR_REDIS(10, "CLEAR_REDIS", "清空缓存");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PDA_BTN(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);
+        }
+    }
+
+    /**
+     * TIME_STATUS
+     */
+    public enum TIME_STATUS {
+        NORMAL(1,"正常"),
+        TIME_OUT(2,"超时");
+
+        private int value;
+        private String description;
+
+        TIME_STATUS(int value,  String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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);
+        }
+    }
 }
 
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -294,6 +294,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 不建议使用该方法，仅在特殊情况下使用。
+     * 如sqlserver库中不允许对长数据字段进行=判断，可使用like替换
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getStringLikeEqualPack(String val, String columnName, DdlPackBean packBean) {
+        if (val != null && val.trim().length() > 0) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " like  :m_" + columnName, val);
+        }
+    }
+
+    /**
      * 封装String对象成不等于语句
      *
      * @param columnName 列名

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name="BAS_VENDOR")
 @Api("供应商信息")
 public class BasVendor extends BaseBean implements Serializable {

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

@@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -32,6 +34,7 @@ import java.util.Map;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "IF_CUST_ORDER_DATA")
 @Api("IF_客户月度订单数据")
 public class IfCustOrderData extends BaseBean implements Serializable {

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -28,6 +30,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "IF_DEFECT_DATA")
 @Api("不良信息接口数据")
 public class IfDefectData extends BaseBean implements Serializable {

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

@@ -0,0 +1,70 @@
+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.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description :IF_订单交付数据
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-11-06
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "IF_DELIVER_ORDER_DATA")
+@Api("IF_订单交付数据")
+public class IfDeliverOrderData extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 855289009053695347L;
+
+    @Column(name = "RGANIZTION_CODE")
+    @ApiParam("工厂代码")
+    private String rganiztionCode;
+
+    @Column(name = "YEAR")
+    @ApiParam("年")
+    private Integer year;
+
+    @Column(name = "MONTH")
+    @ApiParam("月")
+    private Integer month;
+
+    @Column(name = "QTY")
+    @ApiParam("发运数量")
+    private Integer qty = 0;
+
+    @Column(name = "MOVE_TYPE")
+    @ApiParam("移动类型")
+    private Integer moveType;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+}

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -27,6 +29,7 @@ import java.math.BigDecimal;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "IF_DISMENTLE_RECORD")
 @Api("物料拆解表")
 public class IfDismantleRecord extends BaseBean implements Serializable {

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

@@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "IF_EDI_INITIAL_DATA")
 @Api("EDI_初始数据表")
 public class IfEdiInitialData extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -27,8 +29,9 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "IF_PACKAGE")
-@Api("料箱表")
+@Api("包装条码接口表")
 public class IfPackage extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 9099416791684702129L;

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -27,6 +29,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "IF_PACKAGE_DETAIL")
 @Api("包装明细表")
 public class IfPackageDetail extends BaseBean  implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "IF_PART_PULL")
 @Api("IF_物料拉动")
 public class IfPartPull extends BaseBean implements Serializable {

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

@@ -5,6 +5,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.ColumnDefault;
@@ -28,6 +30,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "IF_PRODUCT_OFF_LINE")
 @NoArgsConstructor
 @AllArgsConstructor
@@ -169,10 +172,12 @@ public class IfProductOffLine extends BaseBean implements Serializable {
         this.qcStatus = qcStatus;
     }
 
-    public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime, String workOrderNo) {
+    public IfProductOffLine(String workCenterCode, String partNo, String partName, String itemPartNo, String itemPartName, String packageNo, Double qty, String createDatetime, String workOrderNo) {
         this.workCenterCode = workCenterCode;
         this.partNo = partNo;
         this.partName = partName;
+        this.itemPartNo = itemPartNo;
+        this.itemPartName = itemPartName;
         this.packageNo = packageNo;
         this.qty = qty;
         this.createDatetime = createDatetime;

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "IF_QC_ORDER")
 @Api("IF_质检单")
 public class IfQcOrder extends BaseBean  implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "IF_QC_RESULT")
 @Api("IF_质检结果")
 public class IfQcResult extends BaseBean  implements Serializable {

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -28,6 +30,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "IF_QUEUE_SHIPPING")
 @Api("JIT发运数据同步")
 public class IfQueueShipping extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "IF_RAW_PART_DATA")
 @Api("原料上线数据")
 public class IfRawPartData  extends BaseBean implements Serializable {

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "IF_WMS_PPM")
 @Api("WMS PPM 接口表")
 public class IfWmsPpm extends BaseBean implements Serializable {

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_ACTION")
 @Api("mes系统业务动作")
 public class MesAction extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_ACTION_IF")
 @Api("动作接口配置")
 public class MesActionIf extends BaseBean implements Serializable {

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_ACTION_METHOD")
 @Api("系统业务动作方法")
 public class MesActionMethod extends BaseBean implements Serializable {

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_AGV_STOP_RECORD")
 @Api("MES_停机记录表")
 public class MesAgvStopRecord extends BaseBean implements Serializable {

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

@@ -0,0 +1,44 @@
+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:
+ * @Author: dominic
+ * @Date: 2020/12/03 20:29
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_ANALYSIS_RULE")
+@Api("MES_解析规则")
+public class MesAnalysisRule extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -5274274774653791153L;
+
+    @Column(name = "RULE_CODE")
+    @ApiParam("规则代码")
+    private String ruleCode;
+
+    @Column(name = "ANALYSIS_RULE_CODE")
+    @ApiParam("解析规则")
+    private String analysisRuleCode;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+}

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

@@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -30,6 +32,7 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_AREA")
 @Api("生产区域")
 public class MesArea extends BaseBean implements Serializable {

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

@@ -28,9 +28,9 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BLIND_HISTORY")
 @Api("MES_盲检记录")
-@Inheritance(strategy = InheritanceType.JOINED)
 public class MesBlindHistory extends BaseBean implements Serializable {
     private static final long serialVersionUID = -7459452475180601499L;
 

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -26,6 +28,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BLIND_RULE")
 @Api("MES_盲检规则")
 public class MesBlindRule extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BLIND_TOPIC_SETTING")
 @Api("MES_盲检问题设置")
 public class MesBlindTopicSetting extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -24,6 +26,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD")
 @Api("MES_看板")
 public class MesBoard extends BaseBean implements Serializable {

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

@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -27,6 +29,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_AREA")
 @Api("mes看板车间配置")
 public class MesBoardArea extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -24,6 +26,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_CUSTOM_PARAM_CFG")
 @Api("MES_看板自定义参数配置")
 public class MesBoardCustomParamCfg extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -24,6 +26,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_CUSTOMER_DATA")
 @Api("MES_看板客户相关信息")
 public class MesBoardCustomerData extends BaseBean implements Serializable  {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_DISPLAY")
 @Api("MES_看板跑马灯")
 public class MesBoardDisplay extends BaseBean implements Serializable {

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

@@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -27,6 +29,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_EQU_DETAIL")
 @Api("MES_看板设备明细")
 public class MesBoardEquDetail extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -24,6 +26,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_EQU_STATUS")
 @Api("MES_看板设备状态")
 public class MesBoardEquStatus extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -23,11 +25,12 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_IMAGE")
 @Api("MES_看板图片")
 public class MesBoardImage extends BaseBean implements Serializable {
 
-    private static final long serialVersionUID = -3757764185082659130L;
+    private static final long serialVersionUID = -3511836584646450267L;
 
     @Column(name = "BOARD_CODE")
     @ApiParam("看板代码")

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_LINE")
 @Api("看板产线配置")
 public class MesBoardLine extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_LINE_COORDS_MATRIX")
 @Api("MES_看板产线坐标")
 public class MesBoardLineCoordsMatrix extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_LINE_MATRIX")
 @Api("MES_看板产线矩阵")
 public class MesBoardLineMatrix extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_LINE_STAFF_MATRIX")
 @Api("MES_看板产线员工能力矩阵")
 public class MesBoardLineStaffMatrix extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name="MES_BOARD_MAFACT_ASSESSMENT")
 @Api("MES_看板麦格纳评定项")
 public class MesBoardMafactAssessment extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -24,6 +26,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_MONITOR_OBJECT")
 @Api("MES_看板监控对象")
 public class MesBoardMonitorObject extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -24,6 +26,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_PICTURE")
 @Api("MES_看板图片")
 public class MesBoardPicture extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -27,6 +29,7 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_PLAN_CAPACITY")
 @Api("MES_看板计划产能")
 public class MesBoardPlanCapacity extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -24,6 +26,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_SHIFT")
 @Api("MES_看板班次")
 public class MesBoardShift extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_SHIFT_SECTION")
 @Api("MES_看板班次时段")
 public class MesBoardShiftSection extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_SHIFT_SECTION_CAP")
 @Api("MES_看板时段计划产量")
 public class MesBoardShiftSectionCap extends BaseBean implements Serializable {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -25,6 +27,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_SUBMENU")
 @Api("MES_看板子菜单")
 public class MesBoardSubmenu extends BaseBean implements Serializable  {

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -23,6 +25,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_BOARD_SWITCH_CFG")
 @Api("MES_看板切换配置")
 public class MesBoardSwitchCfg extends BaseBean implements Serializable {