diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java
index 0ad438cbb..9aa217d62 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java
@@ -38,7 +38,6 @@ public class EmisCommissionQuote extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /* 序号 */
-    @TableId(value = "quote_id", type = IdType.AUTO)
     private Long quoteId;
     /* 提成方案编码 */
     private String quoteCode;
@@ -46,6 +45,8 @@ public class EmisCommissionQuote extends BaseEntity
     private String quoteName;
     /* 所属线路代码 */
     private String transLineCode;
+    /* 寄件网点 */
+    private String sendSiteCode;
     /* 产品类型代码 */
     private String prodCode;
     /* 起始国 */
@@ -83,6 +84,9 @@ public class EmisCommissionQuote extends BaseEntity
     /* 产品类型名称 */
     private String prodName;
 
+    // 寄件网点
+    private String sendSiteName;
+
     private List<EmisCommissionExpression> exprList;
 
 
diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
index 49e3da0b0..e3b5d415d 100644
--- a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
@@ -9,6 +9,7 @@
         <result property="quoteCode"    column="quote_code"    />
         <result property="quoteName"    column="quote_name"    />
         <result property="transLineCode"    column="trans_line_code"    />
+        <result property="sendSiteCode"    column="send_site_code"    />
         <result property="prodCode"    column="prod_code"    />
         <result property="fromCountry"    column="from_country"    />
         <result property="country"    column="country"    />
@@ -27,13 +28,15 @@
         <association property="transLine"    column="trans_line_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectMutiLineNameByCode"/>
         <association property="fromCountryName"    column="from_country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectGroupCountryNameByCode"/>
         <association property="countryName"    column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectGroupCountryNameByCode"/>
+        <association property="sendSiteName"    column="send_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectGroupSiteNameByCode"/>
+
 
         <association property="exprList"    column="quote_id" select="com.xdadan.erp.emis.mapper.EmisCommissionExpressionMapper.selectExprListByQuoteId"/>
 
     </resultMap>
 
     <sql id="selectEmisCommissionQuoteVo">
-        select quote_id, quote_code, quote_name, trans_line_code, prod_code, from_country, country, fee_type, calc_type, post_type, trans_type, bl_open, emp_code, emp_name, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_commission_quote
+        select quote_id, quote_code, quote_name, trans_line_code, send_site_code, prod_code, from_country, country, fee_type, calc_type, post_type, trans_type, bl_open, emp_code, emp_name, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_commission_quote
     </sql>
 
     <select id="selectEmisCommissionQuoteList" parameterType="EmisCommissionQuote" resultMap="EmisCommissionQuoteResult">
@@ -41,13 +44,14 @@
         <where>
             del_flag='0'
 
-
-
             <if test="quoteId != null "> and quote_id = #{quoteId}</if>
             <if test="quoteCode != null  and quoteCode != ''"> and quote_code like concat('%', #{quoteCode}, '%')</if>
             <if test="quoteName != null  and quoteName != ''"> and quote_name like concat('%', #{quoteName}, '%')</if>
             <if test="fromCountry != null  and fromCountry != ''"> and ( FIND_IN_SET(#{fromCountry},from_country) or from_country='-1')</if>
             <if test="country != null  and country != ''"> and ( FIND_IN_SET(#{country},country) or country='-1' ) </if>
+
+            <if test="sendSiteCode != null  and sendSiteCode != ''"> and ( ( FIND_IN_SET(#{sendSiteCode},send_site_code)  and send_site_code is not null  )  or send_site_code is null ) </if>
+
             <if test="feeType != null  and feeType != ''"> and fee_type=#{feeType}</if>
             <if test="calcType != null  and calcType != ''"> and calc_type=#{calcType}</if>
             <if test="postType != null  and postType != ''"> and post_type=#{postType}</if>
@@ -77,6 +81,9 @@
             <if test="quoteName != null  and quoteName != ''"> and quote_name like concat('%', #{quoteName}, '%')</if>
             <if test="fromCountry != null  and fromCountry != ''"> and ( FIND_IN_SET(#{fromCountry},from_country) or from_country='-1' or from_country is null or from_country='' or ( #{fromCountry}!='0086' and from_country='-2' ) )</if>
             <if test="country != null  and country != ''"> and ( FIND_IN_SET(#{country},country) or country='-1' or country is null or country=''  or ( #{country}!='0086' and country='-2' )  ) </if>
+
+            <if test="sendSiteCode != null  and sendSiteCode != ''"> and ( ( FIND_IN_SET(#{sendSiteCode},send_site_code)  and send_site_code is not null  )  or send_site_code is null ) </if>
+
             <if test="feeType != null  and feeType != ''"> and fee_type=#{feeType}</if>
             <if test="calcType != null  and calcType != ''"> and calc_type=#{calcType}</if>
             <if test="postType != null  and postType != ''"> and post_type=#{postType}</if>
@@ -123,7 +130,7 @@
 	</select>
 
     <select id="selectEmisCommissionQuoteByQuoteId" parameterType="Long" resultMap="EmisCommissionQuoteResult">
-        select quote_id, quote_code, quote_name, trans_line_code, prod_code, from_country, country, fee_type, calc_type, post_type, trans_type, bl_open, emp_code, emp_name, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select quote_id, quote_code, quote_name, trans_line_code, send_site_code, prod_code, from_country, country, fee_type, calc_type, post_type, trans_type, bl_open, emp_code, emp_name, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_commission_quote a
         where a.quote_id = #{quoteId}
     </select>
@@ -134,6 +141,7 @@
             <if test="quoteCode != null and quoteCode != ''">quote_code,</if>
             <if test="quoteName != null and quoteName != ''">quote_name,</if>
             <if test="transLineCode != null and transLineCode != ''">trans_line_code,</if>
+            <if test="sendSiteCode != null and sendSiteCode != ''">send_site_code,</if>
             <if test="prodCode != null and prodCode != ''">prod_code,</if>
             <if test="fromCountry != null and fromCountry != ''">from_country,</if>
             <if test="country != null and country != ''">country,</if>
@@ -161,6 +169,7 @@
             <if test="quoteCode != null and quoteCode != ''">#{quoteCode},</if>
             <if test="quoteName != null and quoteName != ''">#{quoteName},</if>
             <if test="transLineCode != null and transLineCode != ''">#{transLineCode},</if>
+            <if test="sendSiteCode != null and sendSiteCode != ''">#{sendSiteCode},</if>
             <if test="prodCode != null and prodCode != ''">#{prodCode},</if>
             <if test="fromCountry != null and fromCountry != ''">#{fromCountry},</if>
             <if test="country != null and country != ''">#{country},</if>
@@ -192,17 +201,11 @@
             <if test="quoteCode != null and quoteCode != ''">quote_code = #{quoteCode},</if>
             <if test="quoteName != null and quoteName != ''">quote_name = #{quoteName},</if>
 
-            <!--
-             <if test="transLineCode != null and transLineCode != ''">trans_line_code = #{transLineCode},</if>
-             <if test="prodCode != null and prodCode != ''">prod_code = #{prodCode},</if>
-             <if test="fromCountry != null and fromCountry != ''">from_country = #{fromCountry},</if>
-             <if test="country != null and country != ''">country = #{country},</if>
-             -->
-
              trans_line_code = #{transLineCode},
              prod_code = #{prodCode},
              from_country = #{fromCountry},
              country = #{country},
+             send_site_code = #{sendSiteCode},
 
             <if test="feeType != null and feeType != ''">fee_type = #{feeType},</if>
             <if test="calcType != null and calcType != ''">calc_type = #{calcType},</if>