diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index 697131c..1d3bb9e 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java
index 83b067d..493a665 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java
@@ -59,4 +59,8 @@ public class AndonAlarmType extends BaseBean implements Serializable {
     @ApiParam("安灯类型名称")
     private String description;
 
+    @Transient
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
 }
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java
new file mode 100644
index 0000000..84b7e5d
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java
@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_AREA_ALARM_TYPE")
+@EqualsAndHashCode(callSuper = true)
+@Api("区域安灯类型")
+public class AndonAreaAlarmType extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6551224785612729594L;
+
+    @Column(name = "AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam("安灯类型代码")
+    private String alarmCode;
+
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAreaAlarmTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAreaAlarmTypeRepository.java
new file mode 100644
index 0000000..60f6452
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAreaAlarmTypeRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAreaAlarmType;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-30 11:05
+ * @Modify:
+ **/
+@Repository
+public interface IAndonAreaAlarmTypeRepository extends BaseRepository<AndonAreaAlarmType, Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
index b56e7c1..2ee4cc2 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
@@ -1090,4 +1090,11 @@ public class AndonHqlPack {
         DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean);
         return packBean;
     }
+
+    public static DdlPackBean getAndonAreaAlarmType(AndonAreaAlarmType areaAlarmType, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(areaAlarmType, organizeCode);
+        DdlPreparedPack.getStringLikerPack(areaAlarmType.getAreaCode(), "areaCode", packBean);
+        DdlPreparedPack.getStringLikerPack(areaAlarmType.getAlarmCode(), "alarmCode", packBean);
+        return packBean;
+    }
 }
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index f902a7c..650ee5b 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index d2521de..1e17935 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
index 7313145..9162a1f 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
@@ -1006,7 +1006,7 @@ public class CommonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum USER_LOGIN_STATUS {
         LOGIN_SUCCESS(1, "登录成功", "登录成功"),
-        WRONG_PASSWORD(3, "密码错误", "Linux 密码错误"),
+        WRONG_PASSWORD(3, "密码错误", "用户密码错误"),
         WRONG_USERNAME_OR_PASSWORD(2, "用户名或密码错误", "用户名或密码错误"),
         USER_LOGIN_LOCKING(4, "账号已锁定", "账号已锁定"),
         USER_INFO_NULL(5, "用户信息不存在", "用户信息不存在"),
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
index 64a9161..bb75436 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
@@ -843,7 +843,8 @@ public class ImppEnumUtil {
         DATE(3, "date", "时间"),
         SWITCH(4, "switch", "布尔"),
         SELECT(5, "select", "选择"),
-        FILE(6, "select", "选择");
+        FILE(6, "select", "选择"),
+        ARRAY(7, "array", "数组");
 
         private int value;
         private String name;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 4eaace4..990384d 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -3264,7 +3264,11 @@ public class MesEnumUtil {
         JIT_ORDER(50, "JIT工单"),
         STOCK_ORDER(60, "库存工单"),
         REPAIR(70, "返修插单"),
-        FICTIVE(80, "虚拟工单");
+        EMERGENCY_ORDER(80, "紧急插单"),
+        FICTIVE(90, "虚拟工单"),
+        SPARE_PART_PRODUCTION(100, "备件生产"),
+        REPRODUCTION_RMS(110, "重新生产-报功"),
+        REPRODUCTION_NOT_RMS(120, "重新生产-不报功");
 
         private int value;
         private String description;
@@ -6486,18 +6490,17 @@ public class MesEnumUtil {
     }
 
     /**
-     * 客户JIT预装队列 工单类型
+     * 客户JIT队列下达配置 缓存类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum QUEUE_JIT_PLAN_WORK_ORDER_TYPE {
-        SPARE_PART_PRODUCTION(10, "备件生产"),
-        REPRODUCTION_RMS(20, "重新生产-报功"),
-        REPRODUCTION_NOT_RMS(30, "重新生产-不报功");
+    public enum JIT_ISSUE_CFG_TYPE {
+        ORDER_CACHE(10, "订单池"),
+        LOCK_CACHE(20, "锁定池");
 
         private Integer value;
         private String description;
 
-        QUEUE_JIT_PLAN_WORK_ORDER_TYPE(Integer value, String description) {
+        JIT_ISSUE_CFG_TYPE(Integer value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -6513,7 +6516,79 @@ public class MesEnumUtil {
         public static String valueOfDescription(Integer value) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value.equals(value)) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * JIT队列订单池 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum JIT_ORDER_CACHE_STATUS {
+        CREATE(10, "创建"),
+        COMPLETE(20, "完成"),
+        CANCEL(30, "取消");
+
+        private Integer value;
+        private String description;
+
+        JIT_ORDER_CACHE_STATUS(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * JIT队列锁定池 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum JIT_LOCK_CACHE_STATUS {
+        CREATE(10, "创建"),
+        RELEASE(20, "下达"),
+        ONLINE_COMPLETE(30, "上线完成");
+
+        private Integer value;
+        private String description;
+
+        JIT_LOCK_CACHE_STATUS(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
                     tmp = values()[i].description;
                 }
             }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index 358e5d0..2e23a27 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -1787,7 +1787,8 @@ public class MesPcnEnumUtil {
         PAUSE(40, "暂停"),
         CANCEL(50, "取消"),
         CLOSE(60, "关闭"),
-        COMPLETE(70, "完成");
+        COMPLETE(70, "完成"),
+        FICTIVE(80, "虚拟工单");
 
         private int value;
         private String description;
@@ -1829,7 +1830,11 @@ public class MesPcnEnumUtil {
         JIT_ORDER(50, "JIT工单"),
         STOCK_ORDER(60, "库存工单"),
         REPAIR(70, "返修插单"),
-        EMERGENCY_ORDER(80, "紧急插单");
+        EMERGENCY_ORDER(80, "紧急插单"),
+        FICTIVE(90, "虚拟工单"),
+        SPARE_PART_PRODUCTION(100, "备件生产"),
+        REPRODUCTION_RMS(110, "重新生产-报功"),
+        REPRODUCTION_NOT_RMS(120, "重新生产-不报功");
 
         private int value;
         private String description;
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index b599490..37b8a51 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index aca1465..0a44fb0 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml
index ae38208..6df1cc2 100644
--- a/modules/i3plus-pojo-ics/pom.xml
+++ b/modules/i3plus-pojo-ics/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index a6a0d68..ba89b61 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 04b40d4..fdcf6e3 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
index ebfa83f..150a518 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
@@ -55,8 +55,9 @@ public class LacHqlPack {
     }
 
     public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean) {
-        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean);
 
+        DdlPreparedPack.getNumEqualPack(bean.getLogTaskId(),"logTaskId",ddlPackBean);
         return ddlPackBean;
     }
 
diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml
index 6854e65..d266163 100644
--- a/modules/i3plus-pojo-mdm/pom.xml
+++ b/modules/i3plus-pojo-mdm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index ac387fd..60d9861 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index bbe0ff9..54c8306 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
index 3088e6b..42e7bfb 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
@@ -125,8 +125,8 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 	private String itemUnit;
 
 	@Column(name = "JIT_SEQ")
-	@ApiParam("jit排序号")
-	private Double jitSeq;
+	@ApiParam("JIT排序号")
+	private String jitSeq;
 
 	@Column(name = "JIT_TYPE_FLAG")
 	@ApiParam("JIT类型标识")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
index 109521f..a7e233a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
@@ -31,6 +31,11 @@ import java.io.Serializable;
 @Api("工位投料信息")
 public class MesCellFeed extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1947971369479107782L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("工单号")
+    private String orderNo;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
@@ -68,10 +73,6 @@ public class MesCellFeed extends BaseBean implements Serializable {
     private String supplierCode;
 
     @Transient
-    @ApiParam("工单号")
-    private String orderNo;
-
-    @Transient
     @ApiParam(value = "原料类型名称")
     private String rawTypeName;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java
new file mode 100644
index 0000000..7bfc2e8
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java
@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/3 5:06 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_JIT_ISSUE_CFG")
+@Api("MES_客户JIT队列下达配置")
+public class MesJitIssueCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1475207048628221791L;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户工厂代码")
+    private String custPlantCode;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Integer qty;
+
+    @Column(name = "THRESHOLD_QTY")
+    @ApiParam("触发阈值")
+    private Integer thresholdQty;
+
+    @Column(name = "CFG_TYPE")
+    @ApiParam("缓存类型")
+    private Integer cfgType;
+
+    @Transient
+    @ApiParam("当前JIT缓存数")
+    private Integer currentJitCacheNum;
+
+    @Transient
+    @ApiParam("其他工单数")
+    private Integer otherWorkNum = 0;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java
new file mode 100644
index 0000000..5f98f5e
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java
@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/3 5:14 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_JIT_LOCK_CACHE")
+@Api("MES_JIT队列锁定池")
+public class MesJitLockCache extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -308930683558229105L;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户工厂代码")
+    private String custPlantCode;
+
+    @Column(name = "JIT_ACTUAL_NO")
+    @ApiParam("队列编号")
+    private String jitActualNo;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("vin")
+    private String vinCode;
+
+    @Column(name = "WO_TYPE")
+    @ApiParam("工单类型")
+    private Integer woType;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java
new file mode 100644
index 0000000..d764ed1
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java
@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/3 5:11 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_JIT_ORDER_CACHE")
+@Api("MES_JIT队列订单池")
+public class MesJitOrderCache extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -613326904053045367L;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户工厂代码")
+    private String custPlantCode;
+
+    @Column(name = "JIT_ACTUAL_NO")
+    @ApiParam("队列编号")
+    private String jitActualNo;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("vin")
+    private String vinCode;
+
+    @Column(name = "WO_TYPE")
+    @ApiParam("工单类型")
+    private Integer woType;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name = "SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
index 30cffcc..c0251f8 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
@@ -126,6 +126,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("锁定标识")
     private Integer isLock;
 
+    @Column(name = "WO_TYPE")
+    @ApiParam("工单类型")
+    private Integer woType;
+
     @Transient
     @ApiParam("客户需求开始时间")
     private String custPointStartDate;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
index 9fc4b52..1d1c468 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
@@ -96,4 +96,8 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
     @Column(name = "ASSY_NO")
     @ApiParam("组件编号")
     private String assyNo;
+
+    @Transient
+    @ApiParam("工单类型")
+    private Integer woType;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java
index bb4cb77..8263d3e 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java
@@ -65,6 +65,14 @@ public class MesScrapRecord extends BaseBean implements Serializable {
     @ApiParam("工位")
     private String workCellCode;
 
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("工单编号")
+    private String workOrderNo;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
     @Column(name = "MEMO")
     @ApiParam("备注")
     private String memo;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
index 9cccc86..9a83d79 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java
index 979d50d..93e598e 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java
@@ -55,7 +55,4 @@ public class ButtonComponentReqModel {
     @ApiParam("用户信息")
     private String userInfo;
 
-    @ApiParam("json数据")
-    private String data;
-
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java
index 5c9d2e3..0b33b5d 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java
@@ -21,12 +21,18 @@ public class InjectionProductionControlModel {
     @ApiParam("当前合格数量")
     private String standardQtyCur;
 
-    @ApiParam("当前合格数量")
+    @ApiParam("总完成数量")
     private String completeQty;
 
     @ApiParam("总不合格数量")
     private String scrapQty;
 
+    @ApiParam("已打包数量")
+    private String packageQty;
+
+    @ApiParam("未打包数量")
+    private String unPackageQty;
+
     @ApiParam("包装编号")
     private String packageNo;
 
@@ -39,4 +45,7 @@ public class InjectionProductionControlModel {
     @ApiParam("箱条码状态")
     private String printStatusName;
 
+    @ApiParam("序号")
+    private Integer index;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/JitIssueCfgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/JitIssueCfgModel.java
new file mode 100644
index 0000000..0bc1fbd
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/JitIssueCfgModel.java
@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/4 10:26 上午
+ * @Modify:
+ */
+@Data
+public class JitIssueCfgModel {
+
+    @ApiParam("客户工厂代码")
+    private String custPlantCode;
+
+    @ApiParam("数量")
+    private Integer qty;
+
+    @ApiParam("触发阈值")
+    private Integer thresholdQty;
+
+    @ApiParam("当前JIT缓存数")
+    private Integer currentJitCacheNum;
+
+    @ApiParam("其他工单数")
+    private Integer otherWorkNum = 0;
+
+    @ApiParam("缓存类型")
+    private String cfgType;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java
index 8dfadf4..b3e649b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java
@@ -53,4 +53,7 @@ public class PaintCheckModel {
 
     @ApiParam("界面组件参数数据")
     List<MesWindowModuleParam> windowModuleParamList;
+
+    private String defectType;
+    private String defectDesc;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java
index b6c5a7f..808c05f 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java
@@ -61,4 +61,6 @@ public class PaintWorkOrderSnModel extends BaseBean {
     private String parentPartName;
 
     private List<ProdPackModel> prodPackageList;
+
+    private String partNameRdd;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
index f128cd8..f271030 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
@@ -250,12 +250,14 @@ public class QueueOrderModel implements Serializable {
         this.produceCategoryCode = produceCategoryCode;
     }
 
-    public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode) {
+    // getQueueOrderBySerialNumber
+    public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode, String workType) {
         this.id = id;
         this.queueGroupNo = queueGroupNo;
         this.jitLotNo = jitLotNo;
         this.vinCode = vinCode;
         this.organizeCode = organizeCode;
         this.produceCategoryCode = produceCategoryCode;
+        this.workType = workType;
     }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitIssueCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitIssueCfgRepository.java
new file mode 100644
index 0000000..7b01dcf
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitIssueCfgRepository.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesJitIssueCfg;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/3 5:21 下午
+ * @Modify:
+ */
+public interface MesJitIssueCfgRepository extends BaseRepository<MesJitIssueCfg, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitLockCacheRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitLockCacheRepository.java
new file mode 100644
index 0000000..afc65a8
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitLockCacheRepository.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesJitLockCache;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/3 5:23 下午
+ * @Modify:
+ */
+public interface MesJitLockCacheRepository extends BaseRepository<MesJitLockCache, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitOrderCacheRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitOrderCacheRepository.java
new file mode 100644
index 0000000..57d8fcf
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitOrderCacheRepository.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesJitOrderCache;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/3 5:22 下午
+ * @Modify:
+ */
+public interface MesJitOrderCacheRepository extends BaseRepository<MesJitOrderCache, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index 767ad06..b171b6d 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -3198,4 +3198,21 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 客户JIT队列下达配置
+     * @param jitIssueCfg
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesJitIssueCfg(MesJitIssueCfg jitIssueCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(jitIssueCfg, organizeCode);
+        if (!StringUtils.isEmpty(jitIssueCfg.getCustPlantCode())) {
+            DdlPreparedPack.getStringLikerPack(jitIssueCfg.getCustPlantCode(), "custPlantCode", packBean);
+        }
+        if (jitIssueCfg.getCfgType() != null) {
+            DdlPreparedPack.getNumEqualPack(jitIssueCfg.getCfgType(), "cfgType", packBean);
+        }
+        return packBean;
+    }
 }
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index be533a6..190efa7 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java
index 3977d09..574b9cd 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java
@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.model.lac;
 
-import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;
 
@@ -29,10 +28,4 @@ public class LacSuitRequest implements Serializable {
      */
     private List<Task> taskList;
 
-    /**
-     * 指令集代码
-     */
-    @XStreamCDATA
-    private String paramList;
-
 }
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index 14e8567..5896851 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java
index 8eacda3..903c276 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java
@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -10,7 +9,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Subselect;
 
 import javax.persistence.*;
 import java.util.List;
@@ -32,6 +30,7 @@ import java.util.List;
 public class SysMessage extends BaseBean {
 
     private static final long serialVersionUID = -6090909263221993356L;
+
     @Column(name = "MESSAGE_TITLE")
     @ApiParam(value = "消息标题", access = "消息标题")
     private String messageTitle;
@@ -45,7 +44,7 @@ public class SysMessage extends BaseBean {
     private Integer messageType;
 
     public int getMessageTypeValue() {
-        if(this.messageType == null){
+        if (this.messageType == null) {
             return 0;
         } else {
             return this.messageType.intValue();
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java
index 68dabba..840eb7e 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java
@@ -13,7 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import java.text.DecimalFormat;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 关系-角色菜单
@@ -50,10 +51,18 @@ public class SysRefRoleMenu extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
 
+    @Column(name="SOFT_TYPE")
+    @ApiParam(value ="产品类型")
+    private Integer softType;
+
     @Column(name="ROLE_NAME_Rdd")
     @ApiParam(value ="角色名称" , access ="角色名称")
     private String roleNameRdd;
 
+    @Transient
+    @ApiParam(value ="权限ID列表" , access ="权限ID列表")
+    private List<Long> menuIdList;
+
     public SysRefRoleMenu() {
     }
 
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
index a489f69..56b2696 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
@@ -587,10 +587,11 @@ public class CoreHqlPack {
         DdlPreparedPack.getNumEqualPack(user.getUserStatus(), "userStatus", result);
 //        DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
 
-        DdlPreparedPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", result);
-        DdlPreparedPack.getStringLikerPack(user.getUserName(), "userName", result);
-        DdlPreparedPack.getStringLikerPack(user.getUserEmail(), "userEmail", result);
-        DdlPreparedPack.getStringLikerPack(user.getUserPhone(), "userPhone", result);
+        DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserEmpNo(),"userEmpNo",result);
 //        DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
 
         DdlPreparedPack.getInPackList(idList, "id", result);
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index 102ab0e..aa3dd42 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index 864c56a..80498fc 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java
index 05eb399..668a7e1 100644
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java
@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -34,6 +35,7 @@ public class BrCssStyle extends BaseBean {
     @ApiParam(value ="样式编码")
     private String styleCode;
 
+    @Lob
     @Column(name="STYLE_CONTENT")
     @ApiParam(value ="样式内容")
     private String styleContent;
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index e755225..076f15a 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 194f0cb..1351ed3 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index 60543fe..67b0bff 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index bdc4cab..15d36cd 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index cc8fce6..2eddf76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
+    <version>1.0-DEV-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>