diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
index f77e3e33f..5b6f8e789 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
@@ -69,6 +69,10 @@ public class WaybillOrder  implements Serializable {
 
     /* 快递线路 */
     private String transLine;
+    /* 时效 */
+    private String timeType;
+    /* 计泡比例 */
+    private String meterType;
 
     /* 快递产品类型 */
     private String productType;
@@ -79,6 +83,10 @@ public class WaybillOrder  implements Serializable {
     /* 报关方式 */
     private String customsEclaration;
 
+    /* 预计到达时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date estimateDate;
+
     /* 包装类型 */
     private String packType;
 
@@ -335,13 +343,13 @@ public class WaybillOrder  implements Serializable {
         voItem.setTransLine(dbWaybill.getTransLineType());
         voItem.setProductType(dbWaybill.getProductType());
 
-//        voItem.setTimeType(dbWaybill.getTimeType());
-//        voItem.setMeterType(dbWaybill.getMeterType());
+        voItem.setTimeType(dbWaybill.getTimeType());
+        voItem.setMeterType(dbWaybill.getMeterType());
 
         voItem.setCustomsClear(dbWaybill.getCustomsClear());
         voItem.setCustomsEclaration(dbWaybill.getCustomsEclaration());
 
-//        voItem.setEstimateDate(dbWaybill.getEstimateDate());
+        voItem.setEstimateDate(dbWaybill.getEstimateDate());
 
         voItem.setPackType(dbWaybill.getPackType());
         voItem.setDispatchMethod(dbWaybill.getDispatchMethod());
@@ -543,13 +551,13 @@ public class WaybillOrder  implements Serializable {
         dbWaybill.setTransLineType(this.getTransLine());
         dbWaybill.setProductType(this.getProductType());
 
-//        dbWaybill.setTimeType(this.getTimeType());
-//        dbWaybill.setMeterType(this.getMeterType());
+        dbWaybill.setTimeType(this.getTimeType());
+        dbWaybill.setMeterType(this.getMeterType());
 
         dbWaybill.setCustomsClear(this.getCustomsClear());
         dbWaybill.setCustomsEclaration(this.getCustomsEclaration());
 
-//        dbWaybill.setEstimateDate(this.getEstimateDate());
+        dbWaybill.setEstimateDate(this.getEstimateDate());
 
         dbWaybill.setPackType(this.getPackType());
         dbWaybill.setDispatchMethod(this.getDispatchMethod());