diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteBillControl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteBillControl.java
index 98209151d..0c4f80ddb 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteBillControl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteBillControl.java
@@ -45,4 +45,10 @@ public class EmisSiteBillControl extends BaseEntity
     /* 1-启用 */
     private String blOpen;
 
+
+    /* 寄件网点 */
+    private String sendSiteName;
+    /* 目的网点 */
+    private String destSiteName;
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisSiteBillControlMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteBillControlMapper.xml
index b1fa08acd..bdf7a7c7f 100644
--- a/emis-biz/src/main/resources/mapper/EmisSiteBillControlMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSiteBillControlMapper.xml
@@ -4,35 +4,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisSiteBillControlMapper">
     
-    <resultMap type="EmisSiteBillControl" id="EmisSiteBillControlResult">
+    <resultMap type="EmisSiteBillControl" id="EmisSiteBillControlResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="sendSiteCode"    column="send_site_code"    />
         <result property="destSiteCode"    column="dest_site_code"    />
         <result property="controlDate"    column="control_date"    />
         <result property="blOpen"    column="bl_open"    />
+
+        <result property="sendSiteName"    column="send_site_name"    />
+        <result property="destSiteName"    column="dest_site_name"    />
+
+
     </resultMap>
 
     <sql id="selectEmisSiteBillControlVo">
-        select id, send_site_code, dest_site_code, control_date, bl_open, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_site_bill_control
+        select
+            a.id, a.send_site_code, a.dest_site_code, a.control_date, a.bl_open,
+            a.remark, a.del_flag, a.create_by, a.create_time, a.update_by,
+            a.update_time, a.create_site, a.update_site,
+            b.site_name as send_site_name,
+            c.site_name as dest_site_name
+
+         from emis_site_bill_control a
+           left join emis_site b on a.send_site_code = b.site_code
+           left join emis_site c on a.dest_site_code = c.site_code
     </sql>
 
     <select id="selectEmisSiteBillControlList" parameterType="EmisSiteBillControl" resultMap="EmisSiteBillControlResult">
         <include refid="selectEmisSiteBillControlVo"/>
         <where>  
-             del_flag='0'
-            <if test="id != null "> and id = #{id}</if>
-            <if test="sendSiteCode != null  and sendSiteCode != ''"> and send_site_code like concat('%', #{sendSiteCode}, '%')</if>
-            <if test="destSiteCode != null  and destSiteCode != ''"> and dest_site_code like concat('%', #{destSiteCode}, '%')</if>
-            <if test="controlDate != null "> and control_date = #{controlDate}</if>
-            <if test="blOpen != null  and blOpen != ''"> and bl_open like concat('%', #{blOpen}, '%')</if>
-            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
-            <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
-            <if test="createBy != null  and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
-            <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
-            <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
+             a.del_flag='0'
+            <if test="id != null "> and a.id = #{id}</if>
+            <if test="sendSiteCode != null  and sendSiteCode != ''"> and a.send_site_code like concat('%', #{sendSiteCode}, '%')</if>
+            <if test="destSiteCode != null  and destSiteCode != ''"> and a.dest_site_code like concat('%', #{destSiteCode}, '%')</if>
+            <if test="controlDate != null "> and a.control_date = #{controlDate}</if>
+            <if test="blOpen != null  and blOpen != ''"> and a.bl_open=#{blOpen}</if>
+            <if test="remark != null  and remark != ''"> and a.remark like concat('%', #{remark}, '%')</if>
+            <if test="delFlag != null  and delFlag != ''"> and a.del_flag like concat('%', #{delFlag}, '%')</if>
+            <if test="createBy != null  and createBy != ''"> and a.create_by like concat('%', #{createBy}, '%')</if>
+            <if test="createTime != null "> and a.create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''"> and a.update_by like concat('%', #{updateBy}, '%')</if>
+            <if test="updateTime != null "> and a.update_time = #{updateTime}</if>
+            <if test="createSite != null  and createSite != ''"> and a.create_site like concat('%', #{createSite}, '%')</if>
+            <if test="updateSite != null  and updateSite != ''"> and a.update_site like concat('%', #{updateSite}, '%')</if>
         </where>
         order by create_time desc
     </select>