diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
index de467949d..2ee61d482 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
@@ -58,7 +58,8 @@ public class EmisWaybill extends BaseEntity
     private Long userId;
     /* 寄件客户编号2502021 */
     private String customerCode;
-
+    /* 寄件客户客户名称 */
+    private String customerName;
     /* 收件客户编号2502021 */
     private String receiveCustomerCode;
     /* 收件客户客户名称 */
@@ -343,6 +344,7 @@ public class EmisWaybill extends BaseEntity
     /* 时区偏差 */
     private String timezoneOffset;
 
+
     private List<EmisWaybillCargo> cargoList;
     private List<EmisWaybillFeeitem> feeitemList;
     private List<EmisWaybillAttachment> attachmentList;
@@ -362,12 +364,27 @@ public class EmisWaybill extends BaseEntity
     private String productTypeName;
 
     /* 寄件客户客户名称 */
-    private String customerName;
+//    private String customerName;
 
     // 取件员
     private String takePieceEmployeeName;
 
     private String sendSiteName;
+    // 目的地名称
+    private String destinationName;
+    // 目的网点名称
+    private String dispatchUnderlingSiteName;
+
+    // 派件网点名称,派件人
+    private String dispatchSiteName;
+    private String dispatchManName;
+
+    // 打印
+    private String printManName;
+    private String printSiteName;
+
+
+
 
 
 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 6f50e4325..703f7f2ea 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -164,7 +164,6 @@
         <result property="createSite"    column="create_site"    />
         <result property="updateSite"    column="update_site"    />
 
-
         <association property="receiveCountryName"    column="receive_country" select="selectCountryNameByCode"/>
         <association property="receiveProvinceName"    column="receive_province" select="selectRegionNameByCode"/>
         <association property="receiveCityName"    column="receive_city" select="selectRegionNameByCode"/>
@@ -178,36 +177,51 @@
 
         <association property="sendSiteName"    column="send_site_code" select="selectSiteNameByCode"/>
 
+        <association property="dispatchUnderlingSiteName"    column="dispatch_underling_site_code" select="selectSiteNameByCode"/>
+        <association property="destinationName"    column="send_site_code" select="selectDestNameByCode"/>
+
+        <association property="dispatchSiteName"    column="dispatch_site_code" select="selectSiteNameByCode"/>
+        <association property="dispatchManName"    column="dispatch_man_code" select="selectEmpNameByCode"/>
+
+        <association property="printSiteName"    column="dispatch_site_code" select="selectSiteNameByCode"/>
+        <association property="printManName"    column="print_man_code" select="selectEmpNameByCode"/>
+
 
     </resultMap>
 
-    <select id="selectSiteNameByCode" parameterType="String" resultType="string">
-        select a.site_name from emis_site a where a.site_code = #{code} limit 1
+    <select id="selectDestNameByCode" parameterType="String" resultType="string">
+        select a.dest_name from emis_destination a where a.destination_code = #{code} and a.del_flag='0' limit 1
     </select>
 
+    <select id="selectSiteNameByCode" parameterType="String" resultType="string">
+        select a.site_name from emis_site a where a.site_code = #{code} and a.del_flag='0' limit 1
+    </select>
+
+
+
     <select id="selectCountryNameByCode" parameterType="String" resultType="string">
-        select a.name from emis_country a where a.code = #{code} limit 1
+        select a.name from emis_country a where a.code = #{code} and a.del_flag='0' limit 1
     </select>
 
 
     <select id="selectRegionNameByCode" parameterType="String" resultType="string">
-        select a.region_name from emis_region a where a.region_code = #{code} limit 1
+        select a.region_name from emis_region a where a.region_code = #{code} and a.del_flag='0'  limit 1
     </select>
 
     <select id="selectSiteNameByCode" parameterType="String" resultType="string">
-        select a.site_name from emis_site a where a.site_code = #{code} limit 1
+        select a.site_name from emis_site a where a.site_code = #{code} and a.del_flag='0'  limit 1
     </select>
 
     <select id="selectEmpNameByCode" parameterType="String" resultType="string">
-        select a.emp_name from sys_user a where a.emp_code = #{code} limit 1
+        select a.emp_name from sys_user a where a.emp_code = #{code} and a.del_flag='0'  limit 1
     </select>
 
     <select id="selectProdNameByCode" parameterType="String" resultType="string">
-        select a.prod_name from emis_trans_product a where a.prod_code = #{code} limit 1
+        select a.prod_name from emis_trans_product a where a.prod_code = #{code} and a.del_flag='0' limit 1
     </select>
 
     <select id="selectLineNameByCode" parameterType="String" resultType="string">
-        select a.line_name from emis_trans_line a where a.line_code = #{code} limit 1
+        select a.line_name from emis_trans_line a where a.line_code = #{code} and a.del_flag='0'  limit 1
     </select>