diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.java
new file mode 100644
index 0000000..b217ba9
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.java
@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 安灯子类型
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2019-05-10 17:16
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_ALARM_DETAIL_TYPE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("安灯子类型")
+public class AndonAlarmDetailType extends BaseBean {
+
+    @Column(name = "ALARM_DETAIL_CODE")
+    @ApiParam(value = "安灯类型代码")
+    private String alarmDetailCode;
+
+    @Column(name = "ALARM_DETAIL_NAME")
+    @ApiParam(value = "安灯类型名称")
+    private String alarmDetailName;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型代码")
+    private String alarmCode;
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java
index 091ddec..2a816ce 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java
@@ -51,4 +51,12 @@ public class AndonAlarmResponseCfg extends BaseBean {
     @Column(name = "RP_LEVEL")
     @ApiParam(value = "通知级别")
     private String rpLevel;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心代码")
+    private String workCenterCode;
+
+    @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/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonDisposalCfg.java
new file mode 100644
index 0000000..8991528
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonDisposalCfg.java
@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : ANDON_自处理配置
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-31 14:08
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_DISPOSAL_CFG")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_自处理配置")
+public class AndonDisposalCfg extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam(value = "工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型代码")
+    private String alarmCode;
+
+    @Column(name = "AC_CODE")
+    @ApiParam(value = "呼叫原因代码")
+    private String acCode;
+
+    @Column(name = "APPROVAL_STATUS")
+    @ApiParam(value = "审批状态")
+    private String approvalStatus;
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java
new file mode 100644
index 0000000..1c8726d
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java
@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : ANDON_事件现象
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2019-05-31 9:47
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_EVENT_PHENOMENON")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_事件现象")
+public class AndonEventPhenoMenon extends BaseBean {
+
+    @Column(name = "EPM_CODE")
+    @ApiParam(value = "事件现象代码")
+    private String epmCode;
+
+    @Column(name = "EPM_NAME")
+    @ApiParam(value = "事件现象描述")
+    private String epmName;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStopLineConfig.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.java
similarity index 94%
rename from modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStopLineConfig.java
rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.java
index 9cd1a6f..b1718d0 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStopLineConfig.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.java
@@ -22,7 +22,7 @@ import javax.persistence.Table;
  **/
 @Data
 @Entity
-@Table(name="ANDON_STOP_LINE_CFG", indexes = {
+@Table(name="ANDON_HALT_CFG", indexes = {
         @Index(columnList = "WORK_CENTER_CODE", name = "ANDON_INDEX_WORK_CENTER_CODE"),
         @Index(columnList = "WORK_CELL_CODE", name = "ANDON_INDEX_WORK_CELL_CODE"),
         @Index(columnList = "ORGANIZE_CODE", name = "ANDON_INDEX_ORGANIZE_CODE"),
@@ -32,7 +32,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯队列")
-public class AndonStopLineConfig extends BaseBean {
+public class AndonHaltCfg extends BaseBean {
 
     @Column(name = "ALARM_CODE")
     @ApiParam(value = "安灯类型")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonImportance.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonImportance.java
new file mode 100644
index 0000000..e7d4dc7
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonImportance.java
@@ -0,0 +1,38 @@
+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;
+
+/**
+ * @Description : ANDON_重要度
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2019-05-31 9:47
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_IMPORTANCE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_事件现象")
+public class AndonImportance extends BaseBean {
+
+    @Column(name = "IMPORTANCE_CODE")
+    @ApiParam(value = "重要等级代码")
+    private String importanceCode;
+
+    @Column(name = "IMPORTANCE_NAME")
+    @ApiParam(value = "重要等级名称")
+    private String importanceName;
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java
index 0d568d9..35c7054 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java
@@ -245,6 +245,10 @@ public class AndonManageQueue extends BaseBean {
     private Double proportion;
 
     @Transient
+    @ApiParam(value = "当前比例（累加）", example = "0")
+    private Double currentProportion;
+
+    @Transient
     @ApiParam(value = "总次数（用于报表统计）", example = "0")
     private Integer sumCount;
 
@@ -252,6 +256,41 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "发送标志")
     private String sendFlag;
 
+    /**
+     * 处理类型：10=标准处理，20=自处理
+     */
+    @Column(name = "DISPOSAL_TYPE")
+    @ApiParam(value = "处理类型")
+    private String disposalType;
+
+    /**
+     * 1 = 是，2 = 否
+     */
+    @Transient
+    @ApiParam(value = "是否勾选加入自处理问题库", example = "2")
+    private Integer isDisposal;
+
+    @Column(name = "ALARM_DETAIL_CODE")
+    @ApiParam(value = "安灯子类型代码")
+    private String alarmDetailCode;
+
+    @Column(name = "EPM_CODE")
+    @ApiParam(value = "事件现象代码")
+    private String epmCode;
+
+    @Column(name = "EPM_NAME_RDD")
+    @ApiParam(value = "事件现象描述")
+    private String epmNameRdd;
+
+    @Column(name = "IMPORTANCE_CODE")
+    @ApiParam(value = "重要等级代码")
+    private String importanceCode;
+
+    @Column(name = "IMPORTANCE_NAME_RDD")
+    @ApiParam(value = "重要等级名称")
+    private String importanceNameRdd;
+
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java
index eb0887c..2ddb970 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java
@@ -225,6 +225,37 @@ public class AndonManageRecord extends BaseBean {
     @ApiParam(value = "停机具体原因")
     private String haltDesc;
 
+    @Column(name = "SEND_FLAG")
+    @ApiParam(value = "发送标志")
+    private String sendFlag;
+
+    /**
+     * 处理类型：10=标准处理，20=自处理
+     */
+    @Column(name = "DISPOSAL_TYPE")
+    @ApiParam(value = "处理类型")
+    private String disposalType;
+
+    @Column(name = "ALARM_DETAIL_CODE")
+    @ApiParam(value = "安灯子类型代码")
+    private String alarmDetailCode;
+
+    @Column(name = "EPM_CODE")
+    @ApiParam(value = "事件现象代码")
+    private String epmCode;
+
+    @Column(name = "EPM_NAME_RDD")
+    @ApiParam(value = "事件现象描述")
+    private String epmNameRdd;
+
+    @Column(name = "IMPORTANCE_CODE")
+    @ApiParam(value = "重要等级代码")
+    private String importanceCode;
+
+    @Column(name = "IMPORTANCE_NAME_RDD")
+    @ApiParam(value = "重要等级名称")
+    private String importanceNameRdd;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java
index 8bccd4e..220d4a5 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java
@@ -32,18 +32,10 @@ public class AndonPLC extends BaseBean {
     @ApiParam(value = "工作中心代码")
     private String workCenterCode;
 
-    @Column(name = "WORK_CENTER_NAME")
-    @ApiParam(value = "工作中心名称")
-    private String workCenterName;
-
     @Column(name = "WORK_CELL_CODE")
     @ApiParam(value = "工作单元代码")
     private String workCellCode;
 
-    @Column(name = "WORK_CELL_NAME")
-    @ApiParam(value = "工作单元名称")
-    private String workCellName;
-
     @Column(name = "NODE_CODE")
     @ApiParam(value = "控制节点代码")
     private String nodeCode;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmDetailTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmDetailTypeRepository.java
new file mode 100644
index 0000000..bdd6bab
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmDetailTypeRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmDetailType;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制（ANDON_子类型数据操作层）
+ * @Reference :
+ * @Author : sililter.yuan
+ * @CreateDate : 2019-05-30 11:05
+ * @Modify:
+ **/
+@Repository
+public interface IAndonAlarmDetailTypeRepository extends BaseRepository<AndonAlarmDetailType, Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonDisposalCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonDisposalCfgRepository.java
new file mode 100644
index 0000000..364abf5
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonDisposalCfgRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalCfg;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : ANDON_自处理配置
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-31 14:14
+ * @Modify:
+ **/
+@Repository
+public interface IAndonDisposalCfgRepository extends BaseRepository<AndonDisposalCfg, Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventPhenoMenonRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventPhenoMenonRepository.java
new file mode 100644
index 0000000..bbc00d3
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventPhenoMenonRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonEventPhenoMenon;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制（ANDON_事件现象）
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2019-05-31 11:05
+ * @Modify:
+ **/
+@Repository
+public interface IAndonEventPhenoMenonRepository extends BaseRepository<AndonEventPhenoMenon, Long> {
+}
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStopLineCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltCfgRepository.java
similarity index 68%
rename from modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStopLineCfgRepository.java
rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltCfgRepository.java
index 4042df9..134006a 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStopLineCfgRepository.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltCfgRepository.java
@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.andon.repository;
 
-import cn.estsh.i3plus.pojo.andon.bean.AndonStopLineConfig;
+import cn.estsh.i3plus.pojo.andon.bean.AndonHaltCfg;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import org.springframework.stereotype.Repository;
 
@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface IAndonStopLineCfgRepository extends BaseRepository<AndonStopLineConfig, Long> {
+public interface IAndonHaltCfgRepository extends BaseRepository<AndonHaltCfg, Long> {
 }
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonImportanceRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonImportanceRepository.java
new file mode 100644
index 0000000..e598260
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonImportanceRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonImportance;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制（ANDON_重要度）
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2019-05-31 11:05
+ * @Modify:
+ **/
+@Repository
+public interface IAndonImportanceRepository extends BaseRepository<AndonImportance, 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 3a8daf1..32e0d77 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
@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.andon.sqlpack;
 import cn.estsh.i3plus.pojo.andon.bean.*;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
-import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import org.apache.commons.lang3.StringUtils;
@@ -70,6 +69,7 @@ public class AndonHqlPack {
     public static DdlPackBean packHqlMesWorkCenter(MesWorkCenter mesWorkCenter){
         DdlPackBean result = new DdlPackBean();
 
+        DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", result);
         getStringBuilderPack(mesWorkCenter, result);
 
         return result;
@@ -191,6 +191,23 @@ public class AndonHqlPack {
     }
 
     /**
+     * 按条件查询安灯自处理配置
+     * @param andonDisposalCfg
+     * @return
+     */
+    public static DdlPackBean packHqlAndonDisposalCfg(AndonDisposalCfg andonDisposalCfg){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getWorkCenterCode(),"workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getWorkCellCode(),"workCellCode", result);
+        DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAlarmCode(),"alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAcCode(),"acCode", result);
+
+        getStringBuilderPack(andonDisposalCfg, result);
+        return  result;
+    }
+
+    /**
      * 按条件查询按灯记录信息
      * @param andonManageRecord
      * @return
@@ -341,8 +358,9 @@ public class AndonHqlPack {
 
         DdlPreparedPack.getStringEqualPack(responseCfg.getAlarmCode(), "alarmCode", result);
         DdlPreparedPack.getStringEqualPack(responseCfg.getAndonStatus(), "andonStatus", result);
-        DdlPreparedPack.getNumNOEqualPack(String.valueOf(AndonEnumUtil.ALARM_PRIORITY.FIRST.getValue()),
-                "rpLevel", result);
+        DdlPreparedPack.getStringEqualPack(responseCfg.getRpLevel(), "rpLevel", result);
+        DdlPreparedPack.getStringEqualPack(responseCfg.getWorkCenterCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(responseCfg.getRpObjectCode(), "rpObjectCode", result);
 
         getStringBuilderPack(responseCfg, result);
 
@@ -354,7 +372,7 @@ public class AndonHqlPack {
      * @param stopLineConfig
      * @return
      */
-    public static DdlPackBean packAndonStopLineCfg(AndonStopLineConfig stopLineConfig) {
+    public static DdlPackBean packAndonHaltCfg(AndonHaltCfg stopLineConfig) {
         DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(stopLineConfig.getAlarmCode(), "alarmCode", result);
@@ -365,4 +383,46 @@ public class AndonHqlPack {
 
         return result;
     }
+
+    /**
+     * 安灯子类型信息封装
+     * @param andonAlarmDetailType
+     * @return
+     */
+    public static DdlPackBean packAndonAlarmDetailType(AndonAlarmDetailType andonAlarmDetailType) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result);
+
+        getStringBuilderPack(andonAlarmDetailType, result);
+
+        return result;
+    }
+
+    /**
+     * 安灯类型查询条件封装
+     * @param andonAlarmType
+     * @return
+     */
+    public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) {
+        DdlPackBean result = new DdlPackBean();
+
+        getStringBuilderPack(andonAlarmType, result);
+
+        return result;
+    }
+
+    /**
+     * 安灯状态查询条件封装
+     * @param andonStatus
+     * @return
+     */
+    public static DdlPackBean packAndonStatus(AndonStatus andonStatus) {
+        DdlPackBean result = new DdlPackBean();
+
+        getStringBuilderPack(andonStatus, result);
+
+        return result;
+    }
 }
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 7a0e241..ca940ea 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
@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.base.enumutil;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @Description :
@@ -10,6 +11,80 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * @Modify:
  **/
 public class AndonEnumUtil {
+
+    /**
+     * 标准处理 = 10，自处理 = 20
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DISPOSAL_TYPE{
+        STANDARD("10","标准处理"),
+        SELF("20","自处理");
+
+        private String value;
+        private String description;
+
+        DISPOSAL_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value,val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 审批状态：10=待审批，20=二级审批，30=三级审批，40=四级审批，100=已审批
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum APPROVAL_STATUS{
+        WAIT("10","待审批"),
+        SECOND_APPROVAL("20","二级审批"),
+        THIRD_APPROVAL("30","三级审批"),
+        FOUTH_APPROVAL("40","四级审批"),
+        FINISH("60","已审批");
+
+        private String value;
+        private String description;
+
+        APPROVAL_STATUS(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 (StringUtils.equalsIgnoreCase(values()[i].value,val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
     /**
      * 按灯状态
      * 10-是，20-否
@@ -49,7 +124,7 @@ public class AndonEnumUtil {
 
     /**
      * 按灯业务状态
-     * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40
+     * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40, 安灯子类型=50, 原因代码=60
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_BUSI_FLAG{
@@ -57,7 +132,9 @@ public class AndonEnumUtil {
         ALARM_FLAG("10","安灯呼叫标识"),
         USER_CODE("20","用户工号"),
         READ_FLAG("30", "安灯读取状态"),
-        STOP_FLAG("40", "停线状态");
+        STOP_FLAG("40", "停线状态"),
+        DETAIL_TYPE("50", "安灯子类型"),
+        AC_CODE("60", "原因代码");
 
         private String value;
         private String description;
@@ -86,7 +163,9 @@ public class AndonEnumUtil {
         CALL(1,"10","呼叫"),
         SIGN(2,"20","响应"),
         RESOLVE(3,"30","解决"),
-        CANCEL(4,"40", "撤销");
+        CANCEL(4,"40", "撤销"),
+        COMMIT(5,"50","提交"),
+        PASS(6,"60","审批");
 
         private int value;
         private String code;
@@ -121,16 +200,18 @@ public class AndonEnumUtil {
 
     /**
      * 按灯动作标志
-     * 呼叫=10，签到 =20 ，撤销=30，40-解决，50-转呼
+     * 10 = 呼叫，20 = 签到，30 = 解决，40 = 撤销，50 = 提交，60 = 审批，70 = 转呼
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ANDON_ACTION_FLAG{
 
         CALL_ACTION("10","呼叫动作"),
         SIGN_ACTION("20","签到动作"),
-        CANCEL_ACTION("30", "撤销动作"),
-        RESOLVE_ACTION("40", "解决动作"),
-        SHIFG_CALL_ACTION("50", "转呼动作");
+        RESOLVE_ACTION("30", "解决动作"),
+        CANCEL_ACTION("40", "撤销动作"),
+        COMMIT_ACTION("50","提交动作"),
+        PASS_ACTION("60","审批动作"),
+        SHIFG_CALL_ACTION("70", "转呼动作");
 
         private String value;
         private String description;
@@ -214,6 +295,16 @@ public class AndonEnumUtil {
         public String getDescription() {
             return description;
         }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
@@ -280,4 +371,31 @@ public class AndonEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 按灯通知方式
+     * 10-短信，20-邮箱
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum NOTICE_WAYS{
+
+        SMS("10","短信"),
+        EMAIL("20","邮箱");
+
+        private String value;
+        private String description;
+
+        NOTICE_WAYS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
index 895a4a9..f68a09e 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
@@ -335,7 +335,7 @@ public class BlockFormEnumUtil {
         }
     }
     /**
-     * 元素显示状态信息
+     * 元素属性显示状态信息
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ELEMENT_SHOW_STATUS {
@@ -2036,4 +2036,85 @@ public class BlockFormEnumUtil {
         }
     }
 
+    /**
+     * 元素树方向
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ELEMENT_TREE_DIRECTION {
+        horizontal(1, "horizontal", "横向"),
+        vertical(2, "vertical", "竖向");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private ELEMENT_TREE_DIRECTION (int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static ELEMENT_TREE_DIRECTION  valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java
index 5e56bd1..6a9c5f6 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java
@@ -14,85 +14,6 @@ import java.util.List;
  **/
 public class BlockReportEnumUtil {
 
-    /**
-     * 软件类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum SOFT_TYPE {
-        CORE(2, "i3core", "i3业务平台");
-
-        private int value;
-        private String code;
-        private String description;
-
-        private SOFT_TYPE(int value, String code, String description) {
-            this.value = value;
-            this.code = code;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfCode(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].code;
-                }
-            }
-            return tmp;
-        }
-
-        public static int codeOfValue(String code) {
-            int tmp = 1;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].code.equals(code)) {
-                    tmp = values()[i].value;
-                }
-            }
-            return tmp;
-        }
-
-        public static String valueOfDescription(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-
-        public static SOFT_TYPE valueOf(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    return values()[i];
-                }
-            }
-            return null;
-        }
-
-        public static String codeOfDescription(String code) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].code.equals(code)) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
 
     /**
      * 报表元素枚举
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 43adf39..46454dd 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
@@ -113,6 +113,7 @@ public class CommonEnumUtil {
     /**
      * 处理标识
      */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TRUE_OR_FALSE {
         TRUE(1, "是"), FALSE(2, "否");
 
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 b600f3a..8769a6c 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
@@ -681,4 +681,33 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 通用条码枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COMMON_SN {
+        QUEUE_SN("QUEUE_SN", "队列条码");
+
+        private String code;
+        private String description;
+        int value;
+
+        COMMON_SN(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 912baec..0a3be6b 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -1464,7 +1464,7 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum COMPONENT_TYPE {
 
-        PROCESS_HANDLING(10, "流程处理组件,"),
+        PROCESS_HANDLING(10, "流程处理组件"),
         PROCESS_INITIALIZATION(20, "流程初始化组件"),
         PROCESS_COMMIT(30, "流程提交组件"),
         DETAIL_PROCESS(40, "明细处理组件"),
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
index 04141fd..5477b66 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
@@ -1415,12 +1415,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             Query query = entityManager.createQuery(sb.toString());
             setParameter(query,paramName,paramValue);
 
-            double sumResult = 0.0;
-            List<?> objList = query.getResultList();
-            if(objList.size() > 0){
-                sumResult = Double.parseDouble(objList.iterator().next().toString());
-            }
-            return sumResult;
+            return getNumberByResultList(query.getResultList());
         }else{
             throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue);
         }
@@ -1444,12 +1439,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             Query query = entityManager.createQuery(sb.toString());
             setParameter(query,paramName,paramValue);
 
-            double sumResult = 0.0;
-            List<?> objList = query.getResultList();
-            if(objList.size() > 0){
-                sumResult = Double.parseDouble(objList.iterator().next().toString());
-            }
-            return sumResult;
+            return getNumberByResultList(query.getResultList());
         }else{
             throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue);
         }
@@ -1472,12 +1462,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             Query query = entityManager.createQuery(sb.toString());
             setParameter(query,paramName,paramValue);
 
-            double sumResult = 0.0;
-            List<?> objList = query.getResultList();
-            if(objList.size() > 0){
-                sumResult = Double.parseDouble(objList.iterator().next().toString());
-            }
-            return sumResult;
+            return getNumberByResultList(query.getResultList());
         }else{
             throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue);
         }
@@ -1501,14 +1486,24 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             Query query = entityManager.createQuery(sb.toString());
             setParameter(query,paramName,paramValue);
 
-            double sumResult = 0.0;
-            List<?> objList = query.getResultList();
-            if(objList.size() > 0){
-                sumResult = Double.parseDouble(objList.iterator().next().toString());
-            }
-            return sumResult;
+            return getNumberByResultList(query.getResultList());
         }else{
             throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue);
         }
     }
+
+    //从结果集中获取数字转换
+    public double getNumberByResultList(List objList){
+        double num = 0.0;
+        if(objList != null && objList.size() > 0){
+            if(objList.get(0) != null){
+                try {
+                    num = Double.parseDouble(objList.get(0).toString());
+                }catch(NumberFormatException ne){
+                    LOGGER.error("数字转换出错!",ne);
+                }
+            }
+        }
+        return num;
+    }
 }
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java
index d6d796b..ffbebed 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java
@@ -57,6 +57,10 @@ public class BfCascadeDetail extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long parentId;
 
+    @Column(name = "PARENT_DEFAULT_VALUE")
+    @ApiParam(value = "父级默认值")
+    private String parentDefaultValue;
+
     @Column(name = "PARENT_NAME_RDD")
     @ApiParam(value = "父级名称")
     private String parentNameRdd;
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
index 9f58432..4e27e99 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
@@ -45,11 +45,11 @@ public class BfElementPropertyVirtual extends BaseBean {
     private Long dataObjectId;
 
     @Column(name="PROPERTY_CODE")
-    @ApiParam(value ="类属性名称")
+    @ApiParam(value ="虚拟属性代码")
     private String propertyCode;
 
     @Column(name="PROPERTY_NAME")
-    @ApiParam(value ="元素名称")
+    @ApiParam(value ="虚拟属性名称")
     private String propertyName;
 
     @Column(name="PROPERTY_TYPE")
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
index dc7c2ea..8a7fdfc 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
@@ -37,6 +37,10 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("物料号")
     private String partNo;
 
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
     @Column(name="QTY")
     @ApiParam("数量")
     private Double qty;
@@ -128,4 +132,31 @@ public class MesProduceSn extends BaseBean {
     public int getPrintStatusVal() {
         return this.printStatus == null ? 0 : this.printStatus;
     }
+
+    @Override
+    public String toString() {
+        return "MesProduceSn{" +
+                "serialNumber='" + serialNumber + '\'' +
+                ", partNo='" + partNo + '\'' +
+                ", partNameRdd='" + partNameRdd + '\'' +
+                ", qty=" + qty +
+                ", qcStatus=" + qcStatus +
+                ", snStatus=" + snStatus +
+                ", printCount=" + printCount +
+                ", printStatus=" + printStatus +
+                ", workCenterCode='" + workCenterCode + '\'' +
+                ", workCellCode='" + workCellCode + '\'' +
+                ", routeCode='" + routeCode + '\'' +
+                ", processCode='" + processCode + '\'' +
+                ", nextProcessCode='" + nextProcessCode + '\'' +
+                ", inWorkCenterTime='" + inWorkCenterTime + '\'' +
+                ", outWorkCenterTime='" + outWorkCenterTime + '\'' +
+                ", shippingTime='" + shippingTime + '\'' +
+                ", workOrderNo='" + workOrderNo + '\'' +
+                ", custSn='" + custSn + '\'' +
+                ", custPartNo='" + custPartNo + '\'' +
+                ", packageSn='" + packageSn + '\'' +
+                ", resultMsg='" + resultMsg + '\'' +
+                '}';
+    }
 }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java
new file mode 100644
index 0000000..e5b4ee2
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java
@@ -0,0 +1,134 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+
+/**
+* @Description : 产品条码履历实体类
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2019-05-29 16:22
+* @Modify: 
+**/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PRODUCE_SN_TRAVEL")
+@Api("产品条码履历表")
+public class MesProduceSnTravel extends BaseBean {
+    @Column(name="SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name="QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name="QC_STATUS")
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
+    @Column(name="SN_STATUS")
+    @ApiParam("条码状态")
+    private Integer snStatus;
+
+    @Column(name="PRINT_COUNT")
+    @ApiParam("打印次数")
+    private Integer printCount;
+
+    @Column(name="PRINT_STATUS")
+    @ApiParam("打印状态")
+    private Integer printStatus;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name="PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Column(name="NEXT_PROCESS_CODE")
+    @ApiParam("下一工序代码")
+    private String nextProcessCode;
+
+    @Column(name="IN_WC_TIME")
+    @ApiParam("进产线时间")
+    private String inWorkCenterTime;
+
+    @Column(name="OUT_WC_TIME")
+    @ApiParam("出产线时间")
+    private String outWorkCenterTime;
+
+    @Column(name="SHIPPING_TIME")
+    @ApiParam("发运时间")
+    private String shippingTime;
+
+    @Column(name="WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name="CUST_SN")
+    @ApiParam("客户条码")
+    private String custSn;
+
+    @Column(name="CUST_PART_NO")
+    @ApiParam("客户零件号")
+    private String custPartNo;
+
+    @Column(name="PACKAGE_SN")
+    @ApiParam("包装条码")
+    private String packageSn;
+
+    @Transient
+    @ApiParam("返回信息")
+    private String resultMsg;
+
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public int getQcStatusVal() {
+        return this.qcStatus == null ? 0 : this.qcStatus;
+    }
+
+    public int getSnStatusVal() {
+        return this.snStatus == null ? 0 : this.snStatus;
+    }
+
+    public int getPrintCountVal() {
+        return this.printCount == null ? 0 : this.printCount;
+    }
+
+    public int getPrintStatusVal() {
+        return this.printStatus == null ? 0 : this.printStatus;
+    }
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java
index d32d1cf..d329bba 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.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;
 
 /**
  * @Description:
@@ -24,48 +25,57 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="MES_QUEUE_ORDER_DETAIL")
+@Table(name = "MES_QUEUE_ORDER_DETAIL")
 @Api("生产队列明细")
 public class MesQueueOrderDetail extends BaseBean {
-    @Column(name="ORDER_NO")
+    @Column(name = "ORDER_NO")
     @ApiParam("主队列编号")
     private String orderNo;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;
 
-    @Column(name="PART_NAME_RDD")
+    @Column(name = "PART_NAME_RDD")
     @ApiParam("物料名称")
     private String partNameRdd;
 
-    @Column(name="SERIAL_NUMBER")
+    @Column(name = "SERIAL_NUMBER")
     @ApiParam("产品条码")
     private String serialNumber;
 
-    @Column(name="SEQ")
+    @Column(name = "SEQ")
     @ApiParam("队列明细序号")
     private Double seq;
 
-    @Column(name="QTY")
+    @Column(name = "QTY")
     @ApiParam("数量")
     private Double qty;
 
-    @Column(name="STATUS")
+    @Column(name = "STATUS")
     @ApiParam("状态")
     private Integer status;
 
-    @Column(name="WORK_TYPE")
+    @Column(name = "WORK_TYPE")
     @ApiParam("生产类型")
     private String workType;
 
-    @Column(name="PRODUCE_CATEGORY_CODE")
+    @Column(name = "PRODUCE_CATEGORY_CODE")
     @ApiParam("产品类型代码")
     private String produceCategoryCode;
 
-    @Column(name="PRODUCE_CATEGORY_NAME_RDD")
+    @Column(name = "PRODUCE_CATEGORY_NAME_RDD")
     @ApiParam("产品类型名称")
     private String produceCategoryNameRdd;
+
+    @Transient
+    @ApiParam("队列序号")
+    private Double queueSeq;
+
+    public double getQueueSeqVal() {
+        return this.queueSeq == null ? 0.0d : this.queueSeq;
+    }
+
     public double getSeqVal() {
         return this.seq == null ? 0.0d : this.seq;
     }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java
new file mode 100644
index 0000000..60298a3
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSnTravel;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 条码履历Dao层接口
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2019-05-29 16:36
+* @Modify: 
+**/
+@Repository
+public interface MesProduceSnTravelRepository extends BaseRepository<MesProduceSnTravel, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java
new file mode 100644
index 0000000..52319d0
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCell;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellPoint;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :工站队列Dao层接口
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-05-29 14:40
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkCellPointRepository extends BaseRepository<MesWorkCellPoint, Long> {
+}
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 d0bdab0..f0eaf9e 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
@@ -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;
 
 /**
  * @Description:
@@ -108,6 +109,10 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("包装条码")
     private String packageSn;
 
+    @Transient
+    @ApiParam("返回信息")
+    private String resultMsg;
+
     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/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java
new file mode 100644
index 0000000..8d6678e
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java
@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import io.swagger.annotations.Api;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+* @Description : 产品条码履历实体类
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2019-05-29 16:22
+* @Modify: 
+**/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PRODUCE_SN_TRAVEL")
+@Api("产品条码履历表")
+public class MesProduceSnTravel extends MesProduceSn {
+}
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 d8ee647..636f096 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
@@ -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;
 
 /**
  * @Description:
@@ -66,6 +67,14 @@ public class MesQueueOrderDetail extends BaseBean {
     @Column(name="PRODUCE_CATEGORY_NAME_RDD")
     @ApiParam("产品类型名称")
     private String produceCategoryNameRdd;
+
+    @Transient
+    @ApiParam("队列序号")
+    private Double queueSeq;
+
+    public double getQueueSeqVal() {
+        return this.queueSeq == null ? 0.0d : this.queueSeq;
+    }
     public double getSeqVal() {
         return this.seq == null ? 0.0d : this.seq;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceSnTravelRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceSnTravelRepository.java
new file mode 100644
index 0000000..f128b7c
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceSnTravelRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceSnTravel;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 条码履历Dao层接口
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2019-05-29 16:36
+* @Modify: 
+**/
+@Repository
+public interface MesProduceSnTravelRepository extends BaseRepository<MesProduceSnTravel, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointRepository.java
new file mode 100644
index 0000000..3668ce5
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellPoint;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :工站队列Dao层接口
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-05-29 14:40
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkCellPointRepository extends BaseRepository<MesWorkCellPoint, Long> {
+}
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java
index 09b1731..f4c744c 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java
@@ -32,6 +32,17 @@ public class WmsBsonPack {
         bson = BsonPackTool.getStringEqualPack(actionLog.getOrganizeCode(), "organizeCode", bson);
         bson = BsonPackTool.getNumEqualPack(actionLog.getIsValid(), "isValid", bson);
         bson = BsonPackTool.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", bson);
+
+        if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="")
+                || (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){
+            bson = BsonPackTool.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", bson, true);
+        }
+
+        if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "")
+                || (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){
+            bson = BsonPackTool.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", bson, true);
+        }
+
         return bson;
     }
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
index 28ddb48..cf9215a 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
@@ -56,6 +56,10 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("条码")
     public String sn;
 
+    @Column(name="CSN")
+    @ApiParam("客户条码")
+    public String csn;
+
     /**
      * 状态:1=创建,10=待处理,20=已处理
      */
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
index 0704421..55e0b3f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
@@ -44,6 +44,10 @@ public class WmsZones extends BaseBean {
     @ApiParam(value = "存储区名称")
     private String zoneName;
 
+    @Column(name = "PARENT_ZONE_NO")
+    @ApiParam(value = "上层存储区")
+    private String parentZoneNo;
+
     @Column(name = "IS_PM")
     @ApiParam(value = "零件级管控" , example = "2")
     private Integer isPm;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 74de1b5..c8db411 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -170,10 +170,25 @@ public class WmsHqlPack {
 
     /**
      * 物流路线子表查询条件封装
+     * @param wmsRoutingDetail
+     * @return
+     */
+    public static DdlPackBean packHqlWmsRoutingDetail(WmsRoutingDetail wmsRoutingDetail) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsRoutingDetail.getRoutingCode(), "routingCode", result);
+
+        getStringBuilderPack(wmsRoutingDetail, result);
+        return result;
+    }
+
+    /**
+     * 物流路线子表查询条件封装
      *
      * @param routingCode
      * @return
      */
+    @Deprecated
     public static DdlPackBean packHqlWmsRoutingChildren(String routingCode) {
         DdlPackBean result = new DdlPackBean();
 
@@ -184,6 +199,19 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 物流路线子表查询条件封装
+     * @param wmsRoutingAssign
+     * @return
+     */
+    public static DdlPackBean packHqlWmsRoutingAssign(WmsRoutingAssign wmsRoutingAssign) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsRoutingAssign.getRoutingCode(), "routingCode", result);
+
+        getStringBuilderPack(wmsRoutingAssign, result);
+        return result;
+    }
 
     /**
      * 物流路线主表查询条件封装
@@ -540,6 +568,10 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result);
         //供应商编号
         DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result);
+        //关联单号
+        DdlPreparedPack.getStringLikerPack(wmsCheckFactRecord.getRefSrc(), "refSrc", result);
+        //关联单单据类型
+        DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getRefType(), "refType", result);
 
         getStringBuilderPack(wmsCheckFactRecord, result);