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 4ec6675..6b6f7c2 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
@@ -127,8 +127,8 @@ public class AndonHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcCode(),"acCode", result);
-//        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result);
-//        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
         getStringBuilderPack(andonAlarmCause, result);
 
         return result;
@@ -394,7 +394,7 @@ public class AndonHqlPack {
     public static DdlPackBean packAndonAlarmDetailType(AndonAlarmDetailType andonAlarmDetailType) {
         DdlPackBean result = new DdlPackBean();
 
-//        DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
         DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result);
 
         getStringBuilderPack(andonAlarmDetailType, 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 8f94ef7..60eec44 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
@@ -246,7 +246,8 @@ public class AndonEnumUtil {
         QUALITY("QUALITY_ALARM","质量"),
         EQUIP("EQUMENT_ALARM","设备"),
         PROCESS("ROUTING_ALARM","工艺"),
-        CHECK("OTHER_ALARM","其他");
+        CHECK("OTHER_ALARM","其他"),
+        FIX_ERROR("FIX_ERROR", "设备故障");
 
         private String value;
         private String description;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java
new file mode 100644
index 0000000..9344e2d
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java
@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.model.common;
+
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-06-20 18:50
+ * @Modify:
+ **/
+@Data
+public class ExportDataModel {
+
+    private String className;
+
+    private String exportData;
+
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java
index a5b785e..87ad548 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.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 : 工作中心线边库区关系
@@ -35,4 +36,12 @@ public class WmsWorkCenterZone extends BaseBean {
     @Column(name = "ZONE_NO")
     @ApiParam(value = "线边库区")
     private String zoneNo;
+
+    @Transient
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @Transient
+    @ApiParam("线边库区名称")
+    private String zoneName;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java
index be3972b..f8d418a 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java
@@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsVendorPart;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface WmsVendorPartRepository extends BaseRepository<WmsVendorPart, Long>{
 }
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 2413009..49caa41 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
@@ -1941,4 +1941,20 @@ public class WmsHqlPack {
         return packBean;
     }
 
+    /**
+     * 单位定义
+     *
+     * @param wmsUnit
+     * @return
+     */
+    public static DdlPackBean packHqlWmsUnit(WmsUnit wmsUnit) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitCode(), "unitCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitName(), "unitName", result);
+        DdlPreparedPack.getNumEqualPack(wmsUnit.getUnitPrecision(), "unitPrecision", result);
+        getStringBuilderPack(wmsUnit, result);
+
+        return result;
+    }
 }