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

modules/i3plus-pojo-andon/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-andon</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
@@ -41,7 +42,10 @@ import java.util.List;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯队列")
-public class AndonManageQueue extends BaseManageQueue {
+public class AndonManageQueue extends BaseManageQueue implements Serializable {
+
+    private static final long serialVersionUID = 183865984747203897L;
+
     @Column(name = "SEQ")
     @ApiParam(value = "序号", example = "1")
     private Double seq;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

modules/i3plus-pojo-aps/pom.xml

@@ -12,7 +12,7 @@
 
     <artifactId>i3plus-pojo-aps</artifactId>
     <packaging>jar</packaging>
-
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.base.annotation;
 
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 
 import java.lang.annotation.*;
 
@@ -12,7 +12,7 @@ import java.lang.annotation.*;
 @Target({ElementType.FIELD, ElementType.TYPE})
 public @interface DynamicField {
     // Web前端字段数据类型
-    WmsEnumUtil.FIELD_TYPE webFieldType();
+    CommonEnumUtil.FIELD_TYPE webFieldType();
     // 条件表达式:>,<,>=等
     String conditionExpre() default "=";
     // 条件连接符:and/or
@@ -35,14 +35,16 @@ public @interface DynamicField {
     int isShow() default 1;
     // 是否跳过本字段扫描 0-不跳过，1-跳过
     int isSkip() default 0;
-    // 下拉枚举名称
-    String entityName() default "";
     // 下拉列表显示列名称,多个列名需要根据逗号分隔
     String listColumnName() default "";
     // 下拉搜索列名称,多个列名需要根据逗号分隔
     String searchColumnName() default "";
     // 回显列名
     String explicitColumnName() default "";
-    // 下拉框规则
+    // 是否多选:1-多选，默认2-单选
-    WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE selectRule() default WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_ENUM;
+    int isMultiple() default 2;
+    // 数据来源
+    String dataSrc() default "";
+    // 取值方式
+    CommonEnumUtil.DYNAMIC_FIELD_GET_WAY getValWay() default CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.ENUM;
 }

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

@@ -31,6 +31,8 @@ import java.io.Serializable;
 //@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换
 public abstract class BaseBean implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     //此处使用hibernate的主键策略方式
     //手动设置,使用iplus-platform-common中的idtool生成
     //将Long类型系列化成String避免精度丢失
@@ -41,7 +43,7 @@ public abstract class BaseBean implements Serializable {
     @ApiParam(value = "主键",example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     public Long id;
 
     //get单独处理
@@ -65,7 +67,7 @@ public abstract class BaseBean implements Serializable {
     @Column(name="ORGANIZE_CODE", nullable = false)
     @ApiParam(value ="组织代码")
 //    @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isQuery = 2, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2)
     public String organizeCode;
 
     @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)
@@ -82,54 +84,52 @@ public abstract class BaseBean implements Serializable {
     @Column(name="CREATE_USER",updatable = false)
     @ApiParam(value = "创建用户")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
-            isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name")
+            dataSrc = "/impp/operate/sys-user/query-user-by-pager",
+            searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")
     public String createUser;
 
     @Indexed(direction = IndexDirection.DESCENDING)
     @Column(name="CREATE_DATE_TIME",updatable = false)
     @ApiParam(value = "创建日期")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     public String createDatetime;
 
     @Column(name="MODIFY_USER")
     @ApiParam(value = "修改人")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
-            isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name")
+            dataSrc = "/impp/operate/sys-user/query-user-by-pager",
+            searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")
     public String modifyUser;
 
     @Column(name="MODIFY_DATE_TIME")
     @ApiParam(value = "修改日期")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     public String modifyDatetime;
 
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
     public String createDateTimeStart;
 
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
     public String createDateTimeEnd;
 
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
     public String modifyDateTimeStart;
 
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
     public String modifyDateTimeEnd;
 
     @Transient
@@ -143,6 +143,14 @@ public abstract class BaseBean implements Serializable {
     //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
     public transient Integer ascOrDesc = 1;
 
+    public int getIsValidVal() {
+        return this.isValid == null ? 0 : this.isValid.intValue();
+    }
+
+    public int getIsDeletedVal() {
+        return this.isDeleted == null ? 0 : this.isDeleted.intValue();
+    }
+
     //排序方式
     public String orderBy(){
         String result = "";

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

@@ -62,7 +62,23 @@ public class DdlPackBean {
 
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
-        DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result);
+        DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
+
+        return result;
+    }
+
+    /**
+     * 查询指定组织、指定是否有效的数据
+     * @param organizeCode
+     * @param isValid
+     * @return
+     */
+    public static DdlPackBean getDdlPackBean(String organizeCode, int isValid){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
+        DdlPreparedPack.getNumEqualPack(isValid,"isValid",result);
+        DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
 
         return result;
     }
@@ -141,6 +157,24 @@ public class DdlPackBean {
     }
 
     /**
+     * 添加查询条件-处理多个属性
+     * @param hql
+     * @param hqlMap
+     */
+    public void addColumnQuery(String hql,HashMap<String,Object> hqlMap){
+        if(hqlPreparedMap == null){
+            hqlPreparedMap = new HashMap<>();
+        }
+        if(hqlMap != null && !hqlMap.isEmpty()) {
+            hqlPreparedMap.putAll(hqlMap);
+        }
+
+        whereAppend.append(hql);
+    }
+
+
+
+    /**
      * 需要查询属性的数量
      * @return
      */

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

@@ -985,6 +985,89 @@ public class BlockFormEnumUtil {
     }
 
 
+
+    /**
+     * 元素组织隔离
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ELEMENT_ORGANIZE_ISOLATION_STATUS {
+        ON(1, "ON", "开启"),
+        OFF(2, "OFF", "关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private ELEMENT_ORGANIZE_ISOLATION_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static ELEMENT_ORGANIZE_ISOLATION_STATUS valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
     /**
      * 属性字段排序规则
      */

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

@@ -39,6 +39,8 @@ public class CommonEnumUtil {
         LAC(26, 8600, 13, "lac", "连接适配器"),
         ANDON(27, 8500, 14, "andon", "安灯"),
         APS(28, 8400, 15, "i3aps", "高级计划与排产"),
+
+        MDM(29, 8150, 22, "i3mdm", "数据中心MDM"),
         CENTER(99, 8000, 1, "icloud-server", "注册中心"),
         SURFACE(98, 0, 0, "i3surface", "对外服务"),
         CLOUD(97, 0, 0, "i3cloud", "微服务"),
@@ -2013,8 +2015,8 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ACTUATOR_ENV_PATH {
-        PID(1,"PID" ,"PID"),
+        PID(1,"/PID" ,"PID"),
-        JAVA_VERSION(2, "java.version","jdk版本");
+        JAVA_VERSION(2, "/java.version","jdk版本");
 
         private int value;
         private String path;
@@ -2175,4 +2177,240 @@ public class CommonEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * PC自定义搜索-字段类型
+     * 10-文本，20-数字，30-下拉框，40，时间，50-开窗
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FIELD_TYPE {
+        TEXT(10, "text"), NUMBER(20, "number"),
+        SELECT(30, "select"), DATETIME(40, "datetime"),
+        LIST(50, "list");
+
+        private int value;
+        private String description;
+
+        FIELD_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descriptionOfValue(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static FIELD_TYPE codeOf(Integer value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * PC自定义搜索-取值方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DYNAMIC_FIELD_GET_WAY {
+        ENUM(10, "SINGLE_OBJ", "枚举"),
+        OBJ(20, "MULTIPLE_OBJ", "对象"),
+        URL(30, "SINGLE_OBJ", "接口");
+
+        private int value;
+        private String code;
+        private String description;
+
+        DYNAMIC_FIELD_GET_WAY(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 DYNAMIC_FIELD_GET_WAY codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int 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;
+        }
+    }
+
+
+
+    /**
+     * 业务表：库存条码质检状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOCK_SN_QC_STATUS {
+        NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"),
+        ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废");
+
+        private int value;
+        private String code;
+        private String description;
+
+        STOCK_SN_QC_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String desc) {
+            Integer tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static CommonEnumUtil.STOCK_SN_QC_STATUS codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+
+    /**
+     * 业务表：库存条码状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOCK_SN_STATUS {
+        CREATE(10, "创建"),
+        QUALITY_CONTROL(20, "质检中"),
+        PRE_INSTOCK(30, "待入库"),
+        INSTOCKED(40, "入库"),
+        PICKED(50, "配料"),
+        OUT_STOCK(60, "出库"),
+        SCRAP(70, "报废"),
+        COMMING(80, "在途");
+
+        private int value;
+        private String description;
+
+        STOCK_SN_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 Integer descriptionOfValue(String desc) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

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

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

@@ -11,6 +11,59 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  **/
 
 public class MesEnumUtil {
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum HQL_EXPRESSION {
+        GT(">",">","大于"),
+        LT("<","<","小于"),
+        EQ("=","=","等于"),
+        NEQ("!=","!=","不等于"),
+        GTE(">=",">=","大于等于"),
+        LTE("<=","<=","小于等于"),
+        LIKE("like","like","LIKE"),
+        IN("in","in","包含");
+
+        private String value;
+        private String code;
+        private String description;
+
+        HQL_EXPRESSION(String value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOfDesc(String val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    return values()[i].description;
+                }
+            }
+            return null;
+        }
+
+        public static HQL_EXPRESSION codeOf(String value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
     /**
      * 作业程序组件类型
      */
@@ -430,6 +483,9 @@ public class MesEnumUtil {
 
         NEVER(-1, "不过期"),
         ONE_HOUR(3600, "一小时"),
+        HALF_HOUR(1800, "半小时"),
+        ONE_QUARTER(900, "一刻钟"),
+        TEN_MIN(300, "十分钟"),
         ONE_MIN(60, "一分钟");
 
         private int value;
@@ -644,7 +700,10 @@ public class MesEnumUtil {
         SCRAP("SCRAP", "报废原因"),
         QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
         WC_CHECK("WC_CHECK", "开线检查项"),
-        BOARD("BOARD", "看板类型");
+        BOARD("BOARD", "看板类型"),
+        EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
+        EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
+        EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象");
 
         private String value;
         private String description;
@@ -1796,57 +1855,60 @@ public class MesEnumUtil {
      * mes导入模块
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_INSERT_EXCEL {
+    public enum MES_EXCEL {
-
+
-        MES_PLAN_ORDER(10, "生产计划"),
+        MES_PLAN_ORDER(10, "planOrderExcelService", "生产计划"),
-        MES_EQUIPMENT(20, "设备台账"),
+        MES_EQUIPMENT(20, "equipmentExcelService", "设备台账，支持编辑"),
-        MES_EQU_TASK_STANDARD(30, "设备作业要求"),
+        MES_EQU_TASK_STANDARD(30, "equTaskStandardExcelService", "设备作业要求，支持编辑"),
-        MES_CUST_ORDER(40, "客户订单"),
+        MES_CUST_ORDER(40, "custOrderExcelService", "客户订单"),
-        MES_PCN_SYNC_CFG(50, "PCN同步配置"),
+        MES_PCN_SYNC_CFG(50, "pcnSyncCfgExcelService", "PCN同步配置"),
-        MES_PART(60, "物料表"),
+        MES_PART(60, "partExcelService", "物料表，支持编辑"),
-        MES_PRODUCE_CATEGORY(70, "产品类型"),
+        MES_PRODUCE_CATEGORY(70, "produceCategoryExcelService", "产品类型"),
-        MES_PACK_SPEC(80, "包装规格"),
+        MES_PACK_SPEC(80, "packSpecExcelService", "包装规格，支持编辑"),
-        MES_PROD_PACK(90, "产品包装关系"),
+        MES_PROD_PACK(90, "prodPackExcelService", "产品包装关系"),
-        MES_PRODUCT_ENCODE_CFG(100, "产品编码配置"),
+        MES_PRODUCT_ENCODE_CFG(100, "productEncodeCfgExcelService", "产品编码配置"),
-        MES_BOM(110, "物料清单"),
+        MES_BOM(110, "bomExcelService", "物料清单，支持编辑"),
-        MES_PROD_CFG_TYPE(120, "产品配置类型"),
+        MES_PROD_CFG_TYPE(120, "prodCfgTypeExcelService", "产品配置类型"),
-        MES_CUSTOMER(130, "客户表"),
+        MES_CUSTOMER(130, "customerExcelService", "客户表，支持编辑"),
-        MES_CUSTOMER_PART(140, "客户零件关系表"),
+        MES_CUSTOMER_PART(140, "customerPartExcelService", "客户零件关系表，支持编辑"),
-        MES_WORK_CENTER(150, "生产线"),
+        MES_WORK_CENTER(150, "workCenterExcelService", "生产线，支持编辑"),
-        MES_WORK_CELL(160, "工位"),
+        MES_WORK_CELL(160, "workCellExcelService", "工位，支持编辑"),
-        MES_WC_EQUIPMENT(170, "工位设备关系表"),
+        MES_WC_EQUIPMENT(170, "wcEquipmentExcelService", "工位设备关系表"),
-        MES_SHIFT(180, "班次"),
+        MES_SHIFT(180, "shiftExcelService", "班次，支持编辑"),
-        MES_SHIFT_GROUP(190, "班组"),
+        MES_SHIFT_GROUP(190, "shiftGroupExcelService", "班组，支持编辑"),
-        MES_WORK_CELL_PARAM_CFG(200, "工作单元参数配置"),
+        MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelService", "工作单元参数配置"),
-        MES_STATION_BOM(210, "工位BOM表"),
+        MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表"),
-        MES_DATA_OBJECT(220, "数据对象"),
+        MES_DATA_OBJECT(220, "dataObjectExcelService", "数据对象"),
-        MES_OBJECT_CFG(230, "对象结构"),
+        MES_OBJECT_CFG(230, "objectCfgExcelService", "对象结构"),
-        MES_WC_CHECK(240, "开线检查"),
+        MES_WC_CHECK(240, "wcCheckExcelService", "开线检查，支持编辑"),
-        MES_QC_CHECK_STANDARD(250, "质量检测标准"),
+        MES_QC_CHECK_STANDARD(250, "qcCheckStandardExcelService", "质量检测标准，支持编辑"),
-        MES_FAULT_CAUSE(260, "设备故障原因"),
+        MES_FAULT_CAUSE(260, "faultCauseExcelService", "设备故障原因，支持编辑"),
-        MES_FAULT_METHOD(270, "设备故障处理措施"),
+        MES_FAULT_METHOD(270, "faultMethodExcelService", "设备故障处理措施，支持编辑"),
-        MES_FAULT_PHENOMENON(280, "设备故障现象"),
+        MES_FAULT_PHENOMENON(280, "faultPhenomenonExcelService", "设备故障现象，支持编辑"),
-        MES_DEFECT(290, "缺陷"),
+        MES_DEFECT(290, "defectExcelService", "缺陷，支持编辑"),
-        MES_DEFECT_CAUSE(300, "缺陷原因"),
+        MES_DEFECT_CAUSE(300, "defectCauseExcelService", "缺陷原因，支持编辑"),
-        MES_SCRAP(310, "报废原因"),
+        MES_SCRAP(310, "scrapExcelService", "报废原因，支持编辑"),
-        MES_REPAIR(320, "质量数据处理措施"),
+        MES_REPAIR(320, "repairExcelService", "质量数据处理措施，支持编辑"),
-        MES_EQU_TASK_PLAN(330, "设备作业周期计划"),
+        MES_EQU_TASK_PLAN(330, "equTaskPlanExcelService", "设备作业周期计划，支持编辑"),
-        MES_PART_OJBECT(340, "物料对象"),
+        MES_PART_OJBECT(340, "partObjectExcelService", "物料对象"),
-        MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"),
+        MES_ROUTE_PROCESS_WORK_CELL(350, "routeProcessWorkCellExcelService", "工序工作单元"),
-        MES_DATASOURCE(360, "DB地址清单"),
+        MES_DATASOURCE(360, "datasourceExcelService", "DB地址清单"),
-        MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"),
+        MES_EQU_TASK_NOTIFY_CFG(370, "equTaskNotifyCfgExcelService", "设备通知配置"),
-        MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"),
+        MES_EQU_NOTIFY_OBJECT_CFG(380, "equNotifyObjectCfgExcelService", "设备通知对象"),
-        MES_PLC(390, "PLC地址清单"),
+        MES_PLC(390, "plcExcelService", "PLC地址清单，支持编辑"),
-        MES_PROCESS(400, "工序信息"),
+        MES_PROCESS(400, "processExcelService", "工序信息"),
-        MES_KPSN_RULE(410, "关键件条码校验规则"),
+        MES_KPSN_RULE(410, "kpsnRuleExcelService", "关键件条码校验规则，支持编辑"),
-        MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列"),
+        MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelService", "客户JIT生产队列"),
-        MES_PART_BOM_IMPORT(430, "散件BOM导入");
+        MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"),
+        MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑");
 
         private int value;
+        private String service;
         private String description;
 
-        MES_INSERT_EXCEL(int value, String description) {
+        MES_EXCEL(int value, String service, String description) {
             this.value = value;
+            this.service = service;
             this.description = description;
         }
 
@@ -1854,20 +1916,23 @@ public class MesEnumUtil {
             return value;
         }
 
+        public String getService() {
+            return service;
+        }
+
         public String getDescription() {
             return description;
         }
 
-        public static MES_INSERT_EXCEL getByValue(int value) {
+        public static MES_EXCEL getByValue(int value) {
-            for (MES_INSERT_EXCEL mesInsertExcel : values()) {
+            for (MES_EXCEL excel : values()) {
-                if (mesInsertExcel.getValue() == value) {
+                if (excel.getValue() == value) {
-                    return mesInsertExcel;
+                    return excel;
                 }
             }
             return null;
         }
 
-
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -1878,6 +1943,16 @@ public class MesEnumUtil {
             return tmp;
         }
 
+        public static String valueOfService(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].service;
+                }
+            }
+            return tmp;
+        }
+
     }
 
     /**
@@ -2489,16 +2564,19 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_QC_CHECK_TYPE {
-
+        INCOMING_CHECK(5, "INCOMING_CHECK", "来料检验"),
-        FIRST_CHECK(10, "首检"),
+        FIRST_CHECK(10, "FIRST_CHECK", "首检"),
-        ON_SITE_CHECK(20, "巡检"),
+        ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"),
-        END_CHECK(30, "尾检");
+        END_CHECK(30, "END_CHECK", "末检"),
+        RC_CHECK(40, "RC_CHECK", "发货检验");
 
         private int value;
+        private String code;
         private String description;
 
-        MES_QC_CHECK_TYPE(int value, String description) {
+        MES_QC_CHECK_TYPE(int value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -2506,6 +2584,10 @@ public class MesEnumUtil {
             return value;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }
@@ -5002,7 +5084,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum BOARD_TYPE {
         BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"),
-        BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)");
+        BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"),
+        BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE");
 
         private String code;
         private String description;
@@ -5123,5 +5206,528 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 	界面类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WINDOW_TYPE {
+        BUTTON_CFG(10, "按钮组件"),
+        BOARD_BASE_WINDOW(20, "看板基础页面");
+
+        private int value;
+        private String description;
+
+        WINDOW_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 OPERATE_TYPE {
+        OEE(10, "OEE"),
+        MTBF(20, "MTBF平均故障间隔"),
+        MTTR(30, "MTTR平均修理时间");
+
+        private int value;
+        private String description;
+
+        OPERATE_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 ATTRIBUTE_TYPE {
+        STANDARD_ATTRIBUTE(10, "标准属性"),
+        CUSTOM_ATTRIBUTE(20, "自定义属性");
+
+        private int value;
+        private String description;
+
+        ATTRIBUTE_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 VALUE_TYPE {
+        MANUAL_ASSIGNMENT("10", "手工赋值"),
+        SPEL_EXPRESSION("20", "spel表达式"),
+        FUNCTION_ASSIGNMENT("30", "函数赋值"),
+        JOB_ASSIGNMENT("40", "job赋值");
+
+        private String value;
+        private String description;
+
+        VALUE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static VALUE_TYPE getByValue(String value) {
+            for (VALUE_TYPE valueType : values()) {
+                if (valueType.getValue().equals(value)) {
+                    return valueType;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 	运算对象 对象代码
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OBJECT_CODE {
+        ORGANIZE_OEE("10", "工厂OEE"),
+        WORK_CENTER_OEE("20", "产线OEE"),
+        WORK_CELL_CEE("30", "工位OEE"),
+        EQU_OEE("40", "设备OEE");
+
+        private String value;
+        private String description;
+
+        OBJECT_CODE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static OBJECT_CODE getByValue(String value) {
+            for (OBJECT_CODE objectCode : values()) {
+                if (objectCode.getValue().equals(value)) {
+                    return objectCode;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 	脚本类型（组件、表单、报表、JOB、其他）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SCRIPT_TYPE {
+        ASSEMBLY(10, "组件"),
+        FORM(20, "表单"),
+        REPORT_FORM(30, "报表"),
+        JOB(40, "JOB"),
+        OTHER(50, "其他");
+
+        private int value;
+        private String description;
+
+        SCRIPT_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;
+        }
+    }
+
+    /**
+     * 	语言类型（Groovy、Python、JavaScript、Scala、Ruby）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SCRIPT_LANGUAGE {
+        GROOVY(10, "Groovy"),
+        PYTHON(20, "Python"),
+        JAVA_SCRIPT(30, "JavaScript"),
+        SCALA(40, "Scala"),
+        RUBY(50, "Ruby");
+
+        private int value;
+        private String description;
+
+        SCRIPT_LANGUAGE(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 OPERATE_OBJECT_CODE {
+        ORGANIZE_OEE_HOUR("ORGANIZE_OEE_HOUR", "工厂OEE(小时)"),
+        ORGANIZE_OEE_DAY("ORGANIZE_OEE_DAY", "工厂OEE(天)"),
+        WORK_CENTER_OEE_DAY("WORK_CENTER_OEE_DAY", "产线OEE(天)"),
+        EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)");
+
+        private String value;
+        private String description;
+
+        OPERATE_OBJECT_CODE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static OPERATE_OBJECT_CODE getByValue(String value) {
+            for (OPERATE_OBJECT_CODE objectCode : values()) {
+                if (objectCode.getValue().equals(value)) {
+                    return objectCode;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 	oee 运算状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OEE_STATUS {
+        STAY_OPERATE(10, "待运算"),
+        ALREADY_OPERATE(20, "已运算");
+
+        private int value;
+        private String description;
+
+        OEE_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 QC_STATUS {
+        CREATE(10, "创建"),
+        RECEIPT(20, "执行中"),
+        SUBMISSION(30, "提交"),
+        COMPLETE(40, "完成");
+
+        private int value;
+        private String description;
+
+        QC_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 接口读取标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IN_READ_FLAG {
+        NOTREAD(0, "未读取"),
+        READ(1, "已读取");
+
+        private int value;
+        private String description;
+
+        IN_READ_FLAG(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MES_检验单 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_QC_STATUS {
+
+        CREATE(10, "创建"),
+        IN_EXEC(20, "执行中"),
+        COMPLETE(30, "完成");
+
+        private int value;
+        private String description;
+
+        MES_QC_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MES_检验单 检测整体结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_QC_CHECK_RESULT {
+
+        PASS(10, "通过"),
+        NO_PASS(20, "不通过"),
+        COMPROMISE_PASS(30, "让步通过");
+
+        private int value;
+        private String description;
+
+        MES_QC_CHECK_RESULT(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 
 }

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

@@ -925,10 +925,11 @@ public class MesPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_QC_CHECK_TYPE {
-
+        INCOMING_CHECK(5, "来料检验"),
         FIRST_CHECK(10, "首检"),
         ON_SITE_CHECK(20, "巡检"),
-        END_CHECK(30, "尾检");
+        END_CHECK(30, "末检"),
+        RC_CHECK(40, "发货检验");
 
         private int value;
         private String description;
@@ -3277,7 +3278,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SHIPPING_ACTUAL_STATUS {
         CREATE(10, "创建"),
-        CANCEL(20, "已发运");
+        SHIPPED(20, "已发运");
 
         private int value;
         private String description;
@@ -3338,7 +3339,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FSM_STATE_TYPE {
         BEGIN(10, "begin", "开始状态点"),
-        END(20, "end", "结束状态点");
+        END(40, "end", "结束状态点");
 
         private int value;
         private String code;
@@ -3564,4 +3565,78 @@ public class MesPcnEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 质检单状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_STATUS {
+        CREATE(10, "创建"),
+        RECEIPT(20, "执行中"),
+        SUBMISSION(30, "提交"),
+        COMPLETE(40, "完成");
+
+        private int value;
+        private String description;
+
+        QC_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 整体检测结果状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CHECK_REULST {
+
+        PASS(10, "通过"),
+        NON_PASS(20, "不通过"),
+        CONCESSION_PRODUCTION(30, "让步生产");
+
+        private int value;
+        private String description;
+
+        CHECK_REULST(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -139,6 +139,7 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -537,6 +538,14 @@ public class WmsEnumUtil {
             return code;
         }
 
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
         public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -715,8 +724,8 @@ public class WmsEnumUtil {
         PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
         UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
         TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
-        EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动");
+        EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
-
+        LOADING_ORDER(530, "LOADING_ORDER", "装车单");
         private int value;
         private String code;
         private String description;
@@ -872,7 +881,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -1084,6 +1093,10 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
 
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
@@ -1249,6 +1262,9 @@ public class WmsEnumUtil {
             return tmp;
         }
 
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
@@ -2244,7 +2260,8 @@ public class WmsEnumUtil {
         MATERIAL(40, "MATERIAL", "物料对象"),
         TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"),
         BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象"),
-        BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象");
+        BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"),
+        BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象");
 
         private String code;
         private String description;
@@ -2814,7 +2831,7 @@ public class WmsEnumUtil {
         // 根据枚举编号获取语言代码
         public static String getCodeByIndex(Integer index) {
             for (LANGUAGE_TYPE languageType : LANGUAGE_TYPE.values()) {
-                if (languageType.getValue() == index.intValue()) {
+                if (languageType.getValue() == index) {
                     return languageType.getDescription();
                 }
             }
@@ -2989,6 +3006,7 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -3176,6 +3194,7 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
@@ -3189,7 +3208,10 @@ public class WmsEnumUtil {
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
-        public static int descriptionOfValue(String desc) {return descOf(desc);}
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
 
     }
 
@@ -3276,7 +3298,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -3318,6 +3340,17 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+
+        public static String descriptionOfValue(String desc) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
@@ -3348,7 +3381,7 @@ public class WmsEnumUtil {
     }
 
     public static Map<String, Object> getEnumByName(String enumName) throws Exception {
-        Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
+        Class[] innerClazz = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
         Class<Enum> clazz;
         Enum[] enumConstants;
 
@@ -3446,7 +3479,7 @@ public class WmsEnumUtil {
         public static String getDescription(String code) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == code) {
+                if (values()[i].value.equals(code)) {
                     tmp = values()[i].description;
                 }
             }
@@ -3567,7 +3600,9 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WMS_STOCK_TYPE {
-        SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), CUST_SN(30, "客户条码");
+        SOURCE(10, "实物条码"),
+        TARGET(20, "虚拟条码"),
+        CUST_SN(30, "客户条码");
 
         private int value;
         private String description;
@@ -3692,7 +3727,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -3732,7 +3767,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -3866,7 +3901,7 @@ public class WmsEnumUtil {
         public static String getDes(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -4199,7 +4234,8 @@ public class WmsEnumUtil {
         }
     }
 
-    /**分类
+    /**
+     * 分类
      * 物流规则 处理单位
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -4363,7 +4399,7 @@ public class WmsEnumUtil {
 
 
     /**
-     * 日志推送至MQ的处理类型
+     * 规格层级
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SPEC_LEVEL {
@@ -4791,6 +4827,17 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static int descriptionOfValue(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
     }
 
     /**
@@ -4935,51 +4982,6 @@ public class WmsEnumUtil {
     }
 
     /**
-     * WEB页面字段类型
-     * 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum FIELD_TYPE {
-        TEXT(10, "text"), NUMBER(20, "number"),
-        SELECT(30, "select"), DATETIME(40, "datetime"),
-        LIST(50, "list");
-
-        private int value;
-        private String description;
-
-        FIELD_TYPE(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfDescription(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-        public static FIELD_TYPE codeOf(Integer value) {
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value==value) {
-                    return values()[i];
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
      * 推送类型单位
      * 默认为 10
      */
@@ -5053,6 +5055,7 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
@@ -5066,7 +5069,10 @@ public class WmsEnumUtil {
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
-        public static int descriptionOfValue(String desc) {return descOf(desc);}
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
     }
 
     /**
@@ -5239,7 +5245,7 @@ public class WmsEnumUtil {
     }
 
     /**
-     *  插件类型 10-PDA插件，20-按钮增强插件，30-交易处理插件
+     * 插件类型 10-PDA插件，20-按钮增强插件，30-交易处理插件
      * 默认为 10
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -5301,70 +5307,7 @@ public class WmsEnumUtil {
     }
 
     /**
-     * 动态查询-下拉框规则
+     * 波次合并规则
-     * 默认为 10
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum DYNAMIC_FIELD_SELECT_RULE {
-        SINGLE_ENUM(10, "SINGLE_ENUM", "单选枚举"),
-        MULTIPLE_ENUM(20, "MULTIPLE_ENUM", "多选枚举"),
-        SINGLE_URL(30, "SINGLE_URL", "单选接口"),
-        MULTIPLE_URL(40, "MULTIPLE_URL", "多选接口");
-
-        private int value;
-        private String code;
-        private String description;
-
-        DYNAMIC_FIELD_SELECT_RULE(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 DYNAMIC_FIELD_SELECT_RULE codeOf(int value) {
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == value) {
-                    return values()[i];
-                }
-            }
-            return null;
-        }
-
-        public static String valueOf(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-
-        public static int 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;
-        }
-    }
-
-    /**
-     *  波次合并规则
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WAVE_MERGE_RULE {
@@ -5448,7 +5391,7 @@ public class WmsEnumUtil {
     }
 
     /**
-     *  波次合并规则
+     * 波次合并规则
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WAVE_MERGE_RANGE {
@@ -5563,7 +5506,7 @@ public class WmsEnumUtil {
     }
 
     /**
-     *  插件类型 10-合并规则，20-合并范围
+     * 插件类型 10-合并规则，20-合并范围
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WAVE_MERGE_TYPE {
@@ -5806,7 +5749,7 @@ public class WmsEnumUtil {
             return null;
         }
 
-        public static String valueOfDescription ( int val){
+        public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
@@ -5822,7 +5765,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QAD_DOC_TYPE {
-        TYPE_S(10, "s","s"), TYPE_D(20, "d","d");
+        TYPE_S(10, "s", "s"), TYPE_D(20, "d", "d");
 
         private int value;
         private String code;
@@ -5832,7 +5775,7 @@ public class WmsEnumUtil {
             return code;
         }
 
-        QAD_DOC_TYPE(int value,String code,  String description) {
+        QAD_DOC_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -5898,6 +5841,7 @@ public class WmsEnumUtil {
             }
             return null;
         }
+
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -6383,7 +6327,7 @@ public class WmsEnumUtil {
         private String code;
         private String description;
 
-        PURCHASE_PLAN_HISTORY_STATUS(int value, String code,String description) {
+        PURCHASE_PLAN_HISTORY_STATUS(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -6467,8 +6411,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum BH_VALUE_TYPE {
-        NUMBER(10, "NUMBER", "功能检测"),
+        NUMBER(10, "NUMBER", "数字"),
-        TEXT(20, "TEXT", "尺寸检测");
+        TEXT(20, "TEXT", "文本");
 
         private int value;
         private String code;
@@ -6508,6 +6452,53 @@ public class WmsEnumUtil {
     }
 
     /**
+     * BatchHold 值类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FG_INSTOCK_SN_TYPE {
+        NORMAL(10, "NORMAL", "实物条码(正常)"),
+        FIRST_PIECE(20, "FIRST_PIECE", "首件"),
+        MIDDLE_PIECE(30, "MIDDLE_PIECE", "中件"),
+        TAIL_PIECE(40, "TAIL_PIECE", "末件");
+
+        private int value;
+        private String code;
+        private String description;
+
+        FG_INSTOCK_SN_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
      * 返修、挑选状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -6563,4 +6554,356 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+
+    /**
+     * 返修、挑选状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BOM_TYPE {
+        INIT(10, "PART", "物料"),
+        BE_HANDLE(20, "OUT", "委外"),
+        FINISH(30, "UTENSIL", "器具");
+
+        private int value;
+        private String code;
+        private String description;
+
+        BOM_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 运输方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TRANSPORT_TYPE {
+        LONG_HAUL(10, "长途运输"),
+        SHORT_DISTANCE(20, "短途运输");
+
+        private int value;
+        private String description;
+
+        TRANSPORT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static TRANSPORT_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 物流供应商类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOGISTICS_PROVIDER_TYPE {
+        VENDOR(10, "承运商");
+
+        private int value;
+        private String description;
+
+        LOGISTICS_PROVIDER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static LOGISTICS_PROVIDER_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * BatchHold 物料检测标准值
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_PART_CHECK_STD {
+        NUMBER(1, "NORMAL", "合格"),
+        TEXT(2, "ABNORMAL", "不合格");
+
+        private int value;
+        private String code;
+        private String description;
+
+        BH_PART_CHECK_STD(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+
+    /**
+     * BH检测结果类型 RepairOrPick
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_TEST_RESULT_TYPE {
+        PICK(10, "NORMAL", "挑选"), REPAIR(20, "ABNORMAL", "返修");
+        private int value;
+        private String code;
+        private String description;
+
+        BH_TEST_RESULT_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static BH_TEST_RESULT_TYPE codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+
+    /**
+     * BH检测结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_TEST_RESULT_STATUS {
+        NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格");
+        private int value;
+        private String code;
+        private String description;
+
+        BH_TEST_RESULT_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static BH_TEST_RESULT_STATUS codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
 }

modules/i3plus-pojo-form/pom.xml

@@ -12,7 +12,7 @@
 
     <artifactId>i3plus-pojo-form</artifactId>
     <packaging>jar</packaging>
-
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
 

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

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api(value = "表单按钮", description = "表单按钮")
 public class BfButton extends BaseBean {
 
+    private static final long serialVersionUID = -1675967061983417558L;
     @Column(name = "BUTTON_NAME")
     @ApiParam(value = "按钮名称")
     private String buttonName;
@@ -46,9 +47,14 @@ public class BfButton extends BaseBean {
         }
     }
 
-    @Column(name = "IS_REQUIRED_DATA")
+    @Column(name = "IS_NEED_SELECT_DATA")
-    @ApiParam(value = "是必填数据")
+    @ApiParam(value = "是否需要选中数据")
-    private Integer isRequiredData;
+    private Integer isNeedSelectData;
+
+    @Column(name = "IS_REFRESH")
+    @ApiParam(value = "是否刷新")
+    private Integer isRefresh;
+
 
     // 关联表单功能表id
     @Column(name = "METHOD_ID")

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

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

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

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

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

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

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -32,6 +33,7 @@ import java.util.List;
 @Api(value = "数据对象属性表", description = "数据对象的属性明细表")
 public class BfDataObjectProperty extends BaseBean {
 
+    private static final long serialVersionUID = 2607149135728621568L;
     //外键关联数据对象主键
     @Column(name = "DATA_OBJECT_ID")
     @ApiParam(value = "数据对象ID", example = "-1")
@@ -66,6 +68,10 @@ public class BfDataObjectProperty extends BaseBean {
     @ApiParam(value = "是否允许为空")
     private Integer isNullable;
 
+    public Integer getIsNullableVal(){
+        return isNullable == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isNullable.intValue();
+    }
+
     // 字段长度
     @ApiParam(value = "字段长度")
     @Column(name="OBJECT_COLUMN_PRECISION")

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

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

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -32,6 +33,7 @@ import java.util.List;
 @Api(value = "对象元素基础", description = "元素基础表")
 public class BfElement extends BaseBean {
 
+    private static final long serialVersionUID = -3309080566388373068L;
     //外键关联数据对象主键
     @Column(name = "ELEMENT_INFO_ID")
     @ApiParam(value = "对象元素明细ID", example = "-1")
@@ -82,6 +84,10 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否弱删除")
     private Integer isObjectDelWeak;
 
+    public Integer getIsObjectDelWeakVal(){
+        return isObjectDelWeak == null ? BlockFormEnumUtil.ELEMENT_DELETE_WEAK_STATUS.OFF.getValue() : isObjectDelWeak.intValue();
+    }
+
     @Column(name = "ELEMENT_DEL_WEAK_ATTR_ID")
     @ApiParam(value = "元素弱删除属性id")
     private Long elementDelWeakAttrId;
@@ -90,10 +96,22 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否有效")
     private Integer isObjectValid;
 
+    public Integer getIsObjectValidVal(){
+        return isObjectValid == null ? BlockFormEnumUtil.ELEMENT_VALID_STATUS.OFF.getValue() : isObjectValid.intValue();
+    }
+
     @Column(name = "ELEMENT_VALID_ATTR_ID")
     @ApiParam(value = "元素有效属性id")
     private Long elementValidAttrId;
 
+    @Column(name = "IS_ORGANIZE_ISOLATION")
+    @ApiParam(value = "是否组织隔离")
+    private Integer isOrganizeIsolation;
+
+    public Integer getIsOrganizeIsolationVal(){
+        return isOrganizeIsolation == null ? BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.OFF.getValue() : isOrganizeIsolation.intValue();
+    }
+
     @Column(name = "IS_OBJECT_EXPORT")
     @ApiParam(value = "是否导出")
     private Integer isObjectExport;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

modules/i3plus-pojo-hardswitch/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-hardswitch</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <profiles>
         <profile>

modules/i3plus-pojo-ics/pom.xml

@@ -11,6 +11,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-ics</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

modules/i3plus-pojo-jobflow/pom.xml

@@ -12,7 +12,7 @@
 
     <artifactId>i3plus-pojo-jobflow</artifactId>
     <packaging>jar</packaging>
-
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <profiles>
         <profile>

modules/i3plus-pojo-lac/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-lac</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

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

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

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

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

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

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

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

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

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

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

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

@@ -57,17 +57,18 @@ import javax.persistence.Table;
 @Api(value="适配器",description = "适配器信息")
 public class LacSuitCase extends BaseBean {
 
-    @Column(name="SUTI_CASE_NAME_RDD")
+    private static final long serialVersionUID = 6325924633917664579L;
+    @Column(name="SUIT_CASE_NAME_RDD")
     @ApiParam(value ="适配器名称")
-    private String sutiCaseNameRdd;
+    private String suitCaseNameRdd;
 
     @Column(name="SUIT_CASE_CODE_RDD")
     @ApiParam(value ="适配器代码")
     private String suitCaseCodeRdd;
 
-    @Column(name="SUTI_TYPE")
+    @Column(name="SUIT_TYPE")
     @ApiParam(value ="适配器类型")
-    private Integer sutiType;
+    private Integer suitType;
 
     @Column(name="HARDWARE_TYPE")
     @ApiParam(value ="硬件类型")

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

@@ -61,6 +61,7 @@ import java.util.List;
 @Api(value="调度任务",description = "调度任务信息")
 public class LacSuitTask extends BaseBean {
 
+    private static final long serialVersionUID = -6592851798133225109L;
     @Column(name="TASK_NAME")
     @ApiParam(value ="适配器名称")
     private String taskName;

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

@@ -54,6 +54,7 @@ import javax.persistence.Transient;
 @Api(value="调度任务参数",description = "调度任务参数信息")
 public class LacSuitTaskParam extends BaseBean {
 
+    private static final long serialVersionUID = 3521650869017242460L;
     @Column(name="TASK_ID")
     @ApiParam(value ="任务ID")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -55,6 +55,7 @@ import javax.persistence.Table;
 @Api(value="调度任务参数转换",description = "调度任务参数转换信息")
 public class LacSuitTaskParamAdapter extends BaseBean {
 
+    private static final long serialVersionUID = -4049358225863293288L;
     @Column(name="TASK_ID")
     @ApiParam(value ="任务ID")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -33,6 +33,7 @@ import javax.persistence.Transient;
 @Api(value="任务检查",description = "任务检查")
 public class LacTaskCheck extends BaseBean {
 
+    private static final long serialVersionUID = -4157772560831884634L;
     @Column(name="COMMAND_STACK_TEMPLATE_ID")
     @ApiParam(value ="指令集模板ID")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="任务类型",description = "任务类型")
 public class LacTaskType extends BaseBean {
 
+    private static final long serialVersionUID = 7596608775083338503L;
     @Column(name="TYPE_NAME")
     @ApiParam(value ="类型名称")
     private String typeName;

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java

@@ -65,6 +65,7 @@ public class LacHqlPack {
 
         DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(), "commandStackRecordId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getTaskStatus(), "taskStatus", ddlPackBean);
 
         return ddlPackBean;
     }
@@ -165,6 +166,8 @@ public class LacHqlPack {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bean.getStackStatus(), "stackStatus", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getCommandStackId(), "commandStackId", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bean.getCommandStackNameRdd(), "commandStackNameRdd", ddlPackBean);
         DdlPreparedPack.timeBuilder(bean.getStackStartTime(), "stackStartTime", ddlPackBean,false, true);
 
 
@@ -199,9 +202,9 @@ public class LacHqlPack {
     public static DdlPackBean packHqlLacSuitCase(LacSuitCase bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean);
 
-        DdlPreparedPack.getStringLikerPack(bean.getSutiCaseNameRdd(),"sutiCaseNameRdd",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bean.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bean.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(bean.getSutiType(),"id",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getSuitType(),"suitType",ddlPackBean);
 
         return ddlPackBean;
     }

modules/i3plus-pojo-mdm/pom.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>i3plus-pojo</artifactId>
+        <groupId>i3plus.pojo</groupId>
+        <version>1.0-PROD-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>i3plus-pojo-mdm</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-base</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mdm.bean.base;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Transient;
+
+/**
+ * @Description : MDM基础bean
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-12 17:30
+ * @Modify:
+ **/
+@Data
+@ApiModel("MDM基础bean")
+public class BaseMdmBean extends BaseBean {
+
+    private static final long serialVersionUID = 3957595289035947441L;
+
+    @Transient
+    @ApiModelProperty("是否主数据")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    public static Integer isMdmMaster  = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+
+    @ApiModelProperty("mdm数据版本")
+    private Long mdmVersion;
+
+    public long getMdmVersion() {
+        return mdmVersion == null ? 0 : mdmVersion;
+    }
+
+    // 版本递增
+    public long nextMdmVersion() {
+        return mdmVersion = getMdmVersion() + 1;
+    }
+
+    @ApiModelProperty("是否发布")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    private Integer isPublished;
+
+}