diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index bc7071b..004fb69 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/AndonAlarmRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java
index b8ce4d5..17279ed 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java
@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -46,4 +47,12 @@ public class AndonAlarmRoute extends BaseBean implements Serializable {
     @ApiParam("流程类型")
     private Integer routeType;
 
+    @Transient
+    @ApiParam("安灯类型名称")
+    private String alarmName;
+
+    @Transient
+    @ApiParam("流程名称")
+    private String routeName;
+
 }
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java
new file mode 100644
index 0000000..882ba39
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java
@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
+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 : ANDON_上升流程配置
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 9:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_RITE_ROUTE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_上升流程配置")
+public class AndonRiteRoute extends BaseBean  implements Serializable {
+
+    private static final long serialVersionUID = 5542314911937418047L;
+
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+
+    @AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_ACTION_TAG.class,refForeignKey = "code",value = "description")
+    @Column(name = "ANDON_STATUS")
+    @ApiParam(value = "安灯状态")
+    private String andonStatus;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心")
+    private String workCenterCode;
+
+    @Column(name = "MEMO")
+    @ApiParam(value = "备注")
+    private String memo;
+
+    @AnnoOutputColumn(hidden = true)
+    @Column(name = "WORK_CENTER_NAME_RDD")
+    @ApiParam(value = "工作中心名称")
+    private String workCenterNameRdd;
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java
new file mode 100644
index 0000000..b15ee39
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java
@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
+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 : ANDON_上升配置明细
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 9:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_RITE_ROUTE_DETAIL")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_上升配置明细")
+public class AndonRiteRouteDetail extends BaseBean  implements Serializable {
+
+    private static final long serialVersionUID = 8382210828244626428L;
+
+    @Column(name = "RITE_ROUTE_ID")
+    @ApiParam(value = "上升流程配置ID")
+    private Long riteRouteId;
+
+    @Column(name = "RP_WHERE")
+    @ApiParam(value = "通知时间")
+    private String rpWhere;
+
+    @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
+    @Column(name = "RP_CODE")
+    @ApiParam(value = "通知方式代码")
+    private String rpCode;
+
+    @Column(name = "RP_OBJECT_CODE")
+    @ApiParam(value = "通知对象")
+    private String rpObjectCode;
+
+    @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_LEVEL.class,refForeignKey = "value",value = "description")
+    @Column(name = "RP_LEVEL")
+    @ApiParam(value = "通知级别")
+    private String rpLevel;
+
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java
new file mode 100644
index 0000000..18c8643
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java
@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRouteModuleParam;
+import cn.estsh.i3plus.pojo.andon.bean.AndonRouteModuleParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : 流程明细Model
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2020-04-10 13:27
+ * @Modify:
+ **/
+@Data
+@Api("流程明细Model")
+public class AndonActionModuleGroupModel implements Serializable {
+
+    private static final long serialVersionUID = 2483914575357867288L;
+
+    @ApiParam("组件代码")
+    private String amCode;
+
+    @ApiParam("执行顺序")
+    private Integer seq;
+
+    @ApiParam("流程组件参数集合")
+    private List<AndonRouteModuleParam> routeModuleParamList;
+
+    @ApiParam("区域流程组件参数集合")
+    private List<AndonAlarmRouteModuleParam> alarmRouteModuleParamList;
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBussinessProcessModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBussinessProcessModel.java
new file mode 100644
index 0000000..db1fd3c
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBussinessProcessModel.java
@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : 作业流程Model
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2020-04-10 13:27
+ * @Modify:
+ **/
+@Data
+@Api("作业流程Model")
+public class AndonBussinessProcessModel implements Serializable {
+
+    private static final long serialVersionUID = 801986911134685985L;
+
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @ApiParam("GOJS位置")
+    private String position;
+
+    @ApiParam("流程明细Model集合")
+    private List<AndonProcessDetailModel> processDetailModelList;
+
+    @ApiParam("安灯流程ID")
+    private Long alarmRouteId;
+
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonProcessDetailModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonProcessDetailModel.java
new file mode 100644
index 0000000..929eb24
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonProcessDetailModel.java
@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 流程明细Model
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2020-04-10 13:27
+ * @Modify:
+ **/
+@Data
+@Api("流程明细Model")
+public class AndonProcessDetailModel implements Serializable {
+
+    private static final long serialVersionUID = 5240991498276455147L;
+
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
+    @ApiParam("触发条件（MVEL）")
+    private String triggerWhere;
+
+    @ApiParam("组件集MAP")
+    private Map<String, List<AndonActionModuleGroupModel>> actionModuleGroupMap;
+
+    @ApiParam("下个状态点MAP")
+    private Map<String, String> nextStatusMap;
+
+    @ApiParam("触发调用")
+    private Long actionAmgId;
+
+    @ApiParam("进入状态调用")
+    private Long inAmgId;
+
+    @ApiParam("离开状态调用")
+    private Long outAmgId;
+
+    @ApiParam("界面编号")
+    private String interfaceNo;
+
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRiteRouteDetailModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRiteRouteDetailModel.java
new file mode 100644
index 0000000..efc27bb
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRiteRouteDetailModel.java
@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 上升配置明细model
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-11-12-10:21
+ * @Modify:
+ **/
+@Data
+public class AndonRiteRouteDetailModel implements Serializable {
+
+    private static final long serialVersionUID = 1993963582174708808L;
+
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+
+    @ApiParam(value = "安灯状态")
+    private String andonStatus;
+
+    @ApiParam(value = "工作中心")
+    private String workCenterCode;
+
+    @ApiParam(value = "备注")
+    private String memo;
+
+    @ApiParam(value = "工作中心名称")
+    private String workCenterNameRdd;
+
+    @ApiParam(value = "上升流程配置ID")
+    private Long riteRouteId;
+
+    @ApiParam(value = "通知时间")
+    private String rpWhere;
+
+    @ApiParam(value = "通知方式代码")
+    private String rpCode;
+
+    @ApiParam(value = "通知对象")
+    private String rpObjectCode;
+
+    @ApiParam(value = "通知级别")
+    private String rpLevel;
+
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleGroupRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleGroupRepository.java
new file mode 100644
index 0000000..c14a33b
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleGroupRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleGroup;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonActionModuleGroupRepository extends BaseRepository<AndonActionModuleGroup, Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionRouteRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionRouteRepository.java
new file mode 100644
index 0000000..9da9511
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionRouteRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonActionRoute;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonActionRouteRepository extends BaseRepository<AndonActionRoute, Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteRepository.java
new file mode 100644
index 0000000..2ebac18
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRoute;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonAlarmRouteRepository extends BaseRepository<AndonAlarmRoute, Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteDetailRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteDetailRepository.java
new file mode 100644
index 0000000..9787cb3
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteDetailRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRouteDetail;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface IAndonRiteRouteDetailRepository extends BaseRepository<AndonRiteRouteDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteRepository.java
new file mode 100644
index 0000000..a7bfed3
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRoute;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface IAndonRiteRouteRepository extends BaseRepository<AndonRiteRoute, Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteModuleParamRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteModuleParamRepository.java
new file mode 100644
index 0000000..a84d6ea
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteModuleParamRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonRouteModuleParam;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonRouteModuleParamRepository extends BaseRepository<AndonRouteModuleParam, 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 3cc844f..3240a9a 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
@@ -988,4 +988,66 @@ public class AndonHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 上升流程配置
+     * @param riteRoute
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonRiteRoute(AndonRiteRoute riteRoute, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(riteRoute, organizeCode);
+        if (!StringUtils.isEmpty(riteRoute.getAlarmCode())) {
+            DdlPreparedPack.getStringLikerPack(riteRoute.getAlarmCode(), "alarmCode", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRoute.getAndonStatus())) {
+            DdlPreparedPack.getStringEqualPack(riteRoute.getAndonStatus(), "andonStatus", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRoute.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(riteRoute.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRoute.getWorkCenterNameRdd())) {
+            DdlPreparedPack.getStringLikerPack(riteRoute.getWorkCenterNameRdd(), "workCenterNameRdd", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 上升配置明细
+     * @param riteRouteDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonRiteRouteDetail(AndonRiteRouteDetail riteRouteDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(riteRouteDetail, organizeCode);
+        if (!StringUtils.isEmpty(riteRouteDetail.getRiteRouteId())) {
+            DdlPreparedPack.getNumEqualPack(riteRouteDetail.getRiteRouteId(), "riteRouteId", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRouteDetail.getRpCode())) {
+            DdlPreparedPack.getStringEqualPack(riteRouteDetail.getRpCode(), "rpCode", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRouteDetail.getRpLevel())) {
+            DdlPreparedPack.getStringEqualPack(riteRouteDetail.getRpLevel(), "rpLevel", packBean);
+        }
+        if (!StringUtils.isEmpty(riteRouteDetail.getRpObjectCode())) {
+            DdlPreparedPack.getStringLikerPack(riteRouteDetail.getRpObjectCode(), "rpObjectCode", packBean);
+        }
+        return packBean;
+    }
+
+    public static DdlPackBean packHqlAndonActionRoute(AndonActionRoute actionRoute, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(actionRoute, organizeCode);
+        DdlPreparedPack.getStringLikerPack(actionRoute.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(actionRoute.getRouteName(), "routeName", packBean);
+        DdlPreparedPack.getNumEqualPack(actionRoute.getRouteType(), "routeType", packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean packHqlAndonAlarmRoute(AndonAlarmRoute alarmRoute, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(alarmRoute, organizeCode);
+        DdlPreparedPack.getStringLikerPack(alarmRoute.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(alarmRoute.getAlarmCode(), "alarmCode", packBean);
+        DdlPreparedPack.getNumEqualPack(alarmRoute.getRouteType(), "routeType", 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 807bef5..9f9717e 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/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
index 2350d9d..313523c 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
@@ -13,6 +13,48 @@ import org.apache.commons.lang3.StringUtils;
 public class AndonEnumUtil {
 
     /**
+     * 状态机执行方法
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_STATUS_ACTION_TYPE {
+        TRIGGER("10", "trigger", "触发"),
+        ENTRY("20", "entry", "进入状态"),
+        EXIT("30", "exit", "离开状态");
+
+        private String value;
+        private String code;
+        private String description;
+
+        ROUTE_STATUS_ACTION_TYPE(String value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public static ROUTE_STATUS_ACTION_TYPE getByValue(String value) {
+            for (ROUTE_STATUS_ACTION_TYPE actionType : values()) {
+                if (actionType.getValue().equals(value)) {
+                    return actionType;
+                }
+            }
+            return null;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+
+    /**
      * 状态点界面编号
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -116,14 +158,14 @@ public class AndonEnumUtil {
      * 流程状态-触发类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum ROUTE_TRIGGER_TYPE {
+    public enum ROUTE_STATUS_TRIGGER_TYPE {
         INNER_TRIGGER(10, "内部触发"),
         OUTER_TRIGGER(20, "外部触发");
 
         private int value;
         private String description;
 
-        ROUTE_TRIGGER_TYPE(int value, String description) {
+        ROUTE_STATUS_TRIGGER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -144,8 +186,7 @@ public class AndonEnumUtil {
     public enum ROUTE_STATUS_TYPE {
         START(10, "START", "开始状态"),
         EXECUTING(20, "EXECUTING", "执行中状态"),
-        TERMINATE(30, "TERMINATE", "中断状态"),
-        FINISH(40, "FINISH", "完成状态");
+        FINISH(30, "FINISH", "完成状态");
 
         private int value;
         private String code;
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 85d732e..7dd74eb 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
@@ -3117,7 +3117,9 @@ public class MesEnumUtil {
     public enum METHOD_TYPE {
 
         EXEC(10, "执行方法"),
-        COMPLETE(20, "完成方法");
+        COMPLETE(20, "完成方法"),
+        HNC_ISSUED(30,"队列自动下达"),
+        LABEL_PROPERTIES(40,"标签属性查询方法");
 
         private int value;
         private String 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 71cc67b..724dd11 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
@@ -1812,7 +1812,8 @@ public class MesPcnEnumUtil {
         BH_ORDER(40, "B&H工单"),
         JIT_ORDER(50, "JIT工单"),
         STOCK_ORDER(60, "库存工单"),
-        REPAIR(70,"返修插单");
+        REPAIR(70,"返修插单"),
+        EMERGENCY_ORDER(80,"紧急插单");
 
         private int value;
         private String description;
@@ -3651,7 +3652,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QUEUE_ORDER_QUEUE_TYPE {
         PRODUCT_QUEUE(10, "生产队列"),
-        PRELOAD_QUEUE(20, "预装队列");
+        PRELOAD_QUEUE(20, "预装队列"),
+        FIRST_CELL_QUEUE(30, "首工位队列");
 
         private int value;
         private String description;
@@ -3680,4 +3682,40 @@ public class MesPcnEnumUtil {
         }
     }
 
+
+    /**
+     * 数据复核 校验模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum VERIFY_MODE {
+        PART_NO("10", "按物料号匹配"),
+        WORK_CENTER_CODE("20", "按产线匹配");
+
+        private String value;
+        private String description;
+
+        VERIFY_MODE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java
index 2c5fcb1..34baf30 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java
@@ -137,7 +137,7 @@ public class PtlEnumUtil {
      * 状态机执行方法
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum ROUTE_EVENT {
+    public enum ROUTE_STATUS_ACTION_TYPE {
         TRIGGER("10", "trigger", "触发"),
         ENTRY("20", "entry", "进入状态"),
         EXIT("30", "exit", "离开状态");
@@ -146,16 +146,16 @@ public class PtlEnumUtil {
         private String code;
         private String description;
 
-        ROUTE_EVENT(String value, String code, String description) {
+        ROUTE_STATUS_ACTION_TYPE(String value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
         }
 
-        public static ROUTE_EVENT getByValue(String value) {
-            for (ROUTE_EVENT routeEvent : values()) {
-                if (routeEvent.getValue().equals(value)) {
-                    return routeEvent;
+        public static ROUTE_STATUS_ACTION_TYPE getByValue(String value) {
+            for (ROUTE_STATUS_ACTION_TYPE actionType : values()) {
+                if (actionType.getValue().equals(value)) {
+                    return actionType;
                 }
             }
             return null;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
index 43cd127..4ae9867 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
@@ -553,7 +553,7 @@ public class PtlPcnEnumUtil {
      * 状态机执行方法
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum ROUTE_EVENT {
+    public enum ROUTE_STATUS_ACTION_TYPE {
         TRIGGER("10", "trigger", "触发"),
         ENTRY("20", "entry", "进入状态"),
         EXIT("30", "exit", "离开状态");
@@ -562,7 +562,7 @@ public class PtlPcnEnumUtil {
         private String code;
         private String description;
 
-        ROUTE_EVENT(String value, String code, String description) {
+        ROUTE_STATUS_ACTION_TYPE(String value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index b948580..a9e288f 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 e12eaee..a44418c 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 c338f71..2de88b5 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 1674a47..123fdc9 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 7637865..50ab2c2 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-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml
index d98b7d8..7f94617 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 bf96e57..d800ecf 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 a758a6a..60fc467 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/MesCachaQueue.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java
index a3b9f8b..e250191 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java
@@ -46,4 +46,8 @@ public class MesCachaQueue extends BaseBean implements Serializable {
     @ApiParam("物料号")
     private String partNo;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("生产线")
+    private String workCenterCode;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java
index 2a23858..793f30f 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java
@@ -42,6 +42,10 @@ public class MesLabelTemplate extends BaseBean implements Serializable {
     @ApiParam(value = "模板内容")
     private String templateContent;
 
+    @Column(name = "METHOD_CODE")
+    @ApiParam("方法代码")
+    private String methodCode;
+
     @ApiParam(value = "第二个模板内容")
     private String otherTemplateContent;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
index 8f317e2..bc568d7 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
@@ -132,6 +132,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("操作类型")
     private Integer operateType;
 
+    @Column(name = "PROCESS_LABEL_TEMPLATE")
+    @ApiParam("过程标签模板")
+    private String processLabelTemplate;
+
+    @Column(name = "PROD_LABEL_TEMPLATE")
+    @ApiParam("产品标签模板")
+    private String prodLabelTemplate;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")
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 9ed95ba..b4d21c1 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
@@ -4,8 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -28,12 +27,13 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_QUEUE_JIT_ACTUAL")
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 @Api("MES_客户JIT生产队列")
 public class MesQueueJitActual extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 655875369308810110L;
 
-
     @Column(name = "JIS_ACTUAL_NO")
     @ApiParam("队列编号")
     private String jisActualNo;
@@ -71,7 +71,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     private String custCode;
 
     @Column(name = "CUST_PLANT_CODE")
-    @ApiParam("客户产线代码")
+    @ApiParam("客户工厂代码")
     private String custPlantCode;
 
     @Column(name = "MEMO")
@@ -86,6 +86,38 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("JIT排序号")
     private String jitSeq;
 
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+    @Column(name = "SUPPLIER_NAME")
+    @ApiParam("供应商名称")
+    private String supplierName;
+
+    @Column(name = "VEHICLE_CODE")
+    @ApiParam("车型代码")
+    private String vehicleCode;
+
+    @Column(name = "VEHICLE_NAME")
+    @ApiParam("车型名称")
+    private String vehicleName;
+
+    @Column(name = "MODEL_YEAR")
+    @ApiParam("年度型")
+    private String modelYear;
+
+    @Column(name = "CAR_MODEL_CODE")
+    @ApiParam("车系编号")
+    private String carModelCode;
+
+    @Column(name = "CAR_SERIES")
+    @ApiParam("车系名称")
+    private String carSeries;
+
+    @Column(name = "CUST_PROD_LINE_CODE")
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
     @Transient
     @ApiParam("客户需求开始时间")
     private String custPointStartDate;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java
new file mode 100644
index 0000000..b6663bd
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java
@@ -0,0 +1,62 @@
+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.*;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 10:01 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM")
+@Api("客户JIT生产队列散件清单")
+public class MesQueueJitActualBom extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 1604529847020812472L;
+
+    @Column(name = "JIS_ACTUAL_NO")
+    @ApiParam("队列编号")
+    private String jisActualNo;
+
+    @Column(name = "ASSY_NO")
+    @ApiParam("组件编号")
+    private String assyNo;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "CUST_PART_NO")
+    @ApiParam("客户物料号")
+    private String custPartNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "QTY")
+    @ApiParam("用量")
+    private Double qty = 0d;
+
+    @Column(name = "PART_COLOR_VALUE")
+    @ApiParam("零件色值")
+    private String partColorValue;
+}
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 00efaba..133b159 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
@@ -3,8 +3,7 @@ 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 lombok.*;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -26,6 +25,9 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 @Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL")
 @Api("MES_客户JIT生产队列明细")
 public class MesQueueJitActualDetail extends BaseBean implements Serializable {
@@ -47,6 +49,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
     @ApiParam("产品位置代码")
     private String produceCtgyCode;
 
+    @Column(name = "PRODUCE_CTGY_Name")
+    @ApiParam("产品位置名称")
+    private String produceCtgyName;
+
     @Transient
     @ApiParam("产品位置")
     private String prodCfgName;
@@ -67,11 +73,23 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
     @ApiParam("分组序号")
     private String groupSeq;
 
-    @Column(name = "status")
+    @Column(name = "STATUS")
     @ApiParam("状态")
     private Integer status;
 
-    @Column(name = "seq")
+    @Column(name = "SEQ")
     @ApiParam("主序编号")
     private String seq;
+
+    @Column(name = "PRODUCE_COLOR")
+    @ApiParam("产品颜色")
+    private String produceColor;
+
+    @Column(name = "OPTION_CODE")
+    @ApiParam("选项代码")
+    private String optionCode;
+
+    @Column(name = "ASSY_NO")
+    @ApiParam("组件编号")
+    private String assyNo;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
index 9280efe..57687ae 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
@@ -100,6 +100,18 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("客户JIT队列编号")
     private String jitActualNo;
 
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @Column(name = "MODEL_YEAR")
+    @ApiParam("年度型")
+    private String modelYear;
+
+    @Column(name = "GRADE_CODE")
+    @ApiParam("等级代码")
+    private String gradeCode;
+
     @Transient
     @ApiParam("起始车号")
     private String custFlagNoStart;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java
new file mode 100644
index 0000000..9906cd4
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java
@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\15 10:01
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_ORDER_BOM")
+@Api("MES_生产队列散件清单")
+public class MesQueueOrderBom extends BaseBean  implements Serializable {
+
+    private static final long serialVersionUID = -5412635747424111476L;
+    @Column(name = "ORDER_NO")
+    @ApiParam("主队列编号")
+    private String orderNo;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("Vin")
+    private String vinCode;
+
+    @Column(name = "ASSY_NO")
+    @ApiParam("组件编号")
+    private String assyNo;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "QTY")
+    @ApiParam("用量")
+    private Double qty = 0d;
+
+    @Column(name = "COLOR_CODE")
+    @ApiParam("颜色代码")
+    private String colorCode;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
index 1fe5536..dc2d752 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
@@ -86,7 +86,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
 
     @Column(name = "IS_GROUP_PRINTED")
     @ApiParam("料架是否已打印")
-    private Integer isGroupPrinted;
+    private Integer isGroupPrinted = 2;
 
     @Transient
     @ApiParam("队列序号")
@@ -96,6 +96,70 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("已生产数量")
     private Double finsihQty;
 
+    @Column(name = "PRODUCE_COLOR")
+    @ApiParam("产品颜色")
+    private String produceColor;
+
+    @Column(name = "OPTION_CODE")
+    @ApiParam("选项代码")
+    private String optionCode;
+
+    @Column(name = "ASSY_NO")
+    @ApiParam("组件编号")
+    private String assyNo;
+
+    @Transient
+    @ApiParam("Vin")
+    private String vinCode;
+
+    @Transient
+    @ApiParam("条码状态")
+    private Integer snStatus;
+
+    @Transient
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @Transient
+    @ApiParam("结束时间")
+    private String endTime;
+
+    @Transient
+    @ApiParam("过程标签模板")
+    private String processLabelTemplate;
+
+    @Transient
+    @ApiParam("产品标签模板")
+    private String prodLabelTemplate;
+
+    @Transient
+    @ApiParam("等级代码")
+    private String gradeCode;
+
+    @Transient
+    @ApiParam("标志值集合")
+    private String flagValueList;
+
+    @Transient
+    @ApiParam("质量标志值")
+    private String qcFlagValue;
+
+    @Transient
+    @ApiParam("3C认证编码")
+    private String cccCode;
+
+    @Transient
+    @ApiParam("条码标签描述")
+    private String labelDesc;
+
+    @Transient
+    @ApiParam("打印时间")
+    private String printTime;
+
+    @Transient
+    @ApiParam("年度型")
+    private String modelYear;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0.0d : this.queueSeq;
     }
@@ -120,4 +184,25 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
         this.seq = seq;
         this.serialNumber = serialNumber;
     }
+
+    public MesQueueOrderDetail(String orderNo, String vinCode, String partNo, String partNameRdd, String produceCategoryCode,
+                            Integer status, String serialNumber, Double seq, Integer isGroupPrinted, String createDatetime,
+                            String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,String gradeCode,String assyNo) {
+        this.orderNo = orderNo;
+        this.vinCode = vinCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.produceCategoryCode = produceCategoryCode;
+        this.status = status;
+        this.serialNumber = serialNumber;
+        this.seq = seq;
+        this.isGroupPrinted = isGroupPrinted;
+        this.createDatetime = createDatetime;
+        this.processLabelTemplate = processLabelTemplate;
+        this.prodLabelTemplate = prodLabelTemplate;
+        this.optionCode = optionCode;
+        this.produceColor = produceColor;
+        this.gradeCode = gradeCode;
+        this.assyNo = assyNo;
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java
index d75a1de..bc23151 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java
@@ -75,4 +75,15 @@ public class MesQueueShipping extends BaseBean implements Serializable {
     @ApiParam("客户JIT队列编号")
     private String jitActualNo;
 
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @Column(name = "MODEL_YEAR")
+    @ApiParam("年度型")
+    private String modelYear;
+
+    @Column(name = "GRADE_CODE")
+    @ApiParam("等级代码")
+    private String gradeCode;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
index e1599ec..d2e6a0b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
@@ -126,6 +126,10 @@ public class MesStationBom extends BaseBean implements Serializable {
     @ApiParam("半成品条码")
     private String halfProductSn;
 
+    @Transient
+    @ApiParam("主任务编号")
+    private String orderNo;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualBomRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualBomRepository.java
new file mode 100644
index 0000000..5f8dc01
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualBomRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitActualBom;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/5/21 20:17
+ * @desc
+ */
+@Repository
+public interface MesQueueJitActualBomRepository extends BaseRepository<MesQueueJitActualBom, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderBomRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderBomRepository.java
new file mode 100644
index 0000000..4abfb12
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderBomRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderBom;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesQueueOrderBomRepository extends BaseRepository<MesQueueOrderBom, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
index e54b01b..0b2ef65 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
@@ -456,4 +456,28 @@ public class MesPcnHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 数据对象
+     *
+     * @param mesDataObject
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesDataObject(MesDataObject mesDataObject, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesDataObject, organizeCode);
+        if (!StringUtils.isEmpty(mesDataObject.getObjectCode())) {
+            DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectCode(), "objectCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesDataObject.getObjectName())) {
+            DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectName(), "objectName", packBean);
+        }
+        if (mesDataObject.getOperateType() != null) {
+            DdlPreparedPack.getNumEqualPack(mesDataObject.getOperateType(), "operateType", packBean);
+        }
+        if (!StringUtils.isEmpty(mesDataObject.getFieldPk())) {
+            DdlPreparedPack.getStringLikerPack(mesDataObject.getFieldPk(), "fieldPk", packBean);
+        }
+        return packBean;
+    }
 }
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index efacfd2..d65e031 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-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index dba12cc..a785f21 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-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index 81670b2..d6d2f8e 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 26a7311..0fbfb69 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-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index eaf2544..76739f9 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 0f615b6..0368700 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 9e5f745..b2eedd4 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 0fea52b..5fcd08a 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>