diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java
index ea07161d6..c94bc53ea 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java
@@ -35,6 +35,7 @@ public class EmisQuotePrice extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+
     /* 序号 */
     private Long quoteId;
     /* 报价名称 */
@@ -68,24 +69,28 @@ public class EmisQuotePrice extends BaseEntity
     /* 启用状态 0-启用 1-停用 */
     private Integer status;
     /* 派件区域 */
-    private String dispAreaId;
-    /* 派件区域站点 */
-    private String dispAreaSite;
+    private Long dispAreaId;
     /* 派件区域名称 */
     private String dispAreaName;
+    /* 派件区域站点 */
+    private String dispAreaSite;
+    /* 派件区域站点 */
+    private String dispAreaSiteCode;
     /* 派件区域站点id */
     private String dispAreaSiteId;
     /* 寄件区域 */
-    private String sendAreaId;
+    private Long sendAreaId;
     /* 寄件区域名称 */
     private String sendAreaName;
     /* 寄件区域站点列表 */
     private String sendAreaSite;
     /* 寄件区域站点列表 */
+    private String sendAreaSiteCode;
+    /* 寄件区域站点列表 */
     private String sendAreaSiteId;
-    /* carries_number */
+    /* carries数量 */
     private String carriesNumber;
-    /* discards_number */
+    /* 折扣数量 */
     private String discardsNumber;
     /* 最低价格 */
     private BigDecimal leastPrice;
diff --git a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
index 8dc01a518..36dcb861e 100644
--- a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
@@ -22,12 +22,14 @@
         <result property="carryType"    column="carry_type"    />
         <result property="status"    column="status"    />
         <result property="dispAreaId"    column="disp_area_id"    />
-        <result property="dispAreaSite"    column="disp_area_site"    />
         <result property="dispAreaName"    column="disp_area_name"    />
+        <result property="dispAreaSite"    column="disp_area_site"    />
+        <result property="dispAreaSiteCode"    column="disp_area_site_code"    />
         <result property="dispAreaSiteId"    column="disp_area_site_id"    />
         <result property="sendAreaId"    column="send_area_id"    />
         <result property="sendAreaName"    column="send_area_name"    />
         <result property="sendAreaSite"    column="send_area_site"    />
+        <result property="sendAreaSiteCode"    column="send_area_site_code"    />
         <result property="sendAreaSiteId"    column="send_area_site_id"    />
         <result property="carriesNumber"    column="carries_number"    />
         <result property="discardsNumber"    column="discards_number"    />
@@ -48,7 +50,7 @@
     </resultMap>
 
     <sql id="selectEmisQuotePriceVo">
-        select quote_id, quote_name, quote_code, use_site_code, use_site, trans_line_code, trans_line, fee_type, prod_code, prod_name, rec_pay_type, bill_type, other_type1, other_type2, carry_type, status, disp_area_id, disp_area_site, disp_area_name, disp_area_site_id, send_area_id, send_area_name, send_area_site, send_area_site_id, carries_number, discards_number, least_price, price_type, 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_quote_price
+        select quote_id, quote_name, quote_code, use_site_code, use_site, trans_line_code, trans_line, fee_type, prod_code, prod_name, rec_pay_type, bill_type, other_type1, other_type2, carry_type, status, disp_area_id, disp_area_name, disp_area_site, disp_area_site_code, disp_area_site_id, send_area_id, send_area_name, send_area_site, send_area_site_code, send_area_site_id, carries_number, discards_number, least_price, price_type, 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_quote_price
     </sql>
 
     <select id="selectEmisQuotePriceList" parameterType="EmisQuotePrice" resultMap="EmisQuotePriceResult">
@@ -70,13 +72,15 @@
             <if test="otherType2 != null  and otherType2 != ''"> and other_type2 like concat('%', #{otherType2}, '%')</if>
             <if test="carryType != null  and carryType != ''"> and carry_type like concat('%', #{carryType}, '%')</if>
             <if test="status != null "> and status = #{status}</if>
-            <if test="dispAreaId != null  and dispAreaId != ''"> and disp_area_id like concat('%', #{dispAreaId}, '%')</if>
-            <if test="dispAreaSite != null  and dispAreaSite != ''"> and disp_area_site like concat('%', #{dispAreaSite}, '%')</if>
+            <if test="dispAreaId != null "> and disp_area_id like concat('%', #{dispAreaId}, '%')</if>
             <if test="dispAreaName != null  and dispAreaName != ''"> and disp_area_name like concat('%', #{dispAreaName}, '%')</if>
+            <if test="dispAreaSite != null  and dispAreaSite != ''"> and disp_area_site like concat('%', #{dispAreaSite}, '%')</if>
+            <if test="dispAreaSiteCode != null  and dispAreaSiteCode != ''"> and disp_area_site_code like concat('%', #{dispAreaSiteCode}, '%')</if>
             <if test="dispAreaSiteId != null  and dispAreaSiteId != ''"> and disp_area_site_id like concat('%', #{dispAreaSiteId}, '%')</if>
-            <if test="sendAreaId != null  and sendAreaId != ''"> and send_area_id like concat('%', #{sendAreaId}, '%')</if>
+            <if test="sendAreaId != null "> and send_area_id like concat('%', #{sendAreaId}, '%')</if>
             <if test="sendAreaName != null  and sendAreaName != ''"> and send_area_name like concat('%', #{sendAreaName}, '%')</if>
             <if test="sendAreaSite != null  and sendAreaSite != ''"> and send_area_site like concat('%', #{sendAreaSite}, '%')</if>
+            <if test="sendAreaSiteCode != null  and sendAreaSiteCode != ''"> and send_area_site_code like concat('%', #{sendAreaSiteCode}, '%')</if>
             <if test="sendAreaSiteId != null  and sendAreaSiteId != ''"> and send_area_site_id like concat('%', #{sendAreaSiteId}, '%')</if>
             <if test="carriesNumber != null  and carriesNumber != ''"> and carries_number like concat('%', #{carriesNumber}, '%')</if>
             <if test="discardsNumber != null  and discardsNumber != ''"> and discards_number like concat('%', #{discardsNumber}, '%')</if>
@@ -99,15 +103,15 @@
     </select>
 
     <select id="selectEmisQuotePriceByQuoteId" parameterType="Long" resultMap="EmisQuotePriceResult">
-        select quote_id, quote_name, quote_code, use_site_code, use_site, trans_line_code, trans_line, fee_type, prod_code, prod_name, rec_pay_type, bill_type, other_type1, other_type2, carry_type, status, disp_area_id, disp_area_site, disp_area_name, disp_area_site_id, send_area_id, send_area_name, send_area_site, send_area_site_id, carries_number, discards_number, least_price, price_type, 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_name, quote_code, use_site_code, use_site, trans_line_code, trans_line, fee_type, prod_code, prod_name, rec_pay_type, bill_type, other_type1, other_type2, carry_type, status, disp_area_id, disp_area_name, disp_area_site, disp_area_site_code, disp_area_site_id, send_area_id, send_area_name, send_area_site, send_area_site_code, send_area_site_id, carries_number, discards_number, least_price, price_type, 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_quote_price a
         where a.quote_id = #{quoteId}
     </select>
 
-
-    <insert id="insertEmisQuotePrice" parameterType="EmisQuotePrice" useGeneratedKeys="true" keyProperty="quoteId">
+    <insert id="insertEmisQuotePrice" parameterType="EmisQuotePrice">
         insert into emis_quote_price
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="quoteId != null">quote_id,</if>
             <if test="quoteName != null and quoteName != ''">quote_name,</if>
             <if test="quoteCode != null and quoteCode != ''">quote_code,</if>
             <if test="useSiteCode != null and useSiteCode != ''">use_site_code,</if>
@@ -123,13 +127,15 @@
             <if test="otherType2 != null and otherType2 != ''">other_type2,</if>
             <if test="carryType != null and carryType != ''">carry_type,</if>
             <if test="status != null">status,</if>
-            <if test="dispAreaId != null and dispAreaId != ''">disp_area_id,</if>
-            <if test="dispAreaSite != null and dispAreaSite != ''">disp_area_site,</if>
+            <if test="dispAreaId != null">disp_area_id,</if>
             <if test="dispAreaName != null and dispAreaName != ''">disp_area_name,</if>
+            <if test="dispAreaSite != null and dispAreaSite != ''">disp_area_site,</if>
+            <if test="dispAreaSiteCode != null and dispAreaSiteCode != ''">disp_area_site_code,</if>
             <if test="dispAreaSiteId != null and dispAreaSiteId != ''">disp_area_site_id,</if>
-            <if test="sendAreaId != null and sendAreaId != ''">send_area_id,</if>
+            <if test="sendAreaId != null">send_area_id,</if>
             <if test="sendAreaName != null and sendAreaName != ''">send_area_name,</if>
             <if test="sendAreaSite != null and sendAreaSite != ''">send_area_site,</if>
+            <if test="sendAreaSiteCode != null and sendAreaSiteCode != ''">send_area_site_code,</if>
             <if test="sendAreaSiteId != null and sendAreaSiteId != ''">send_area_site_id,</if>
             <if test="carriesNumber != null and carriesNumber != ''">carries_number,</if>
             <if test="discardsNumber != null and discardsNumber != ''">discards_number,</if>
@@ -149,6 +155,7 @@
             <if test="updateSite != null and updateSite != ''">update_site,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="quoteId != null">#{quoteId},</if>
             <if test="quoteName != null and quoteName != ''">#{quoteName},</if>
             <if test="quoteCode != null and quoteCode != ''">#{quoteCode},</if>
             <if test="useSiteCode != null and useSiteCode != ''">#{useSiteCode},</if>
@@ -164,13 +171,15 @@
             <if test="otherType2 != null and otherType2 != ''">#{otherType2},</if>
             <if test="carryType != null and carryType != ''">#{carryType},</if>
             <if test="status != null">#{status},</if>
-            <if test="dispAreaId != null and dispAreaId != ''">#{dispAreaId},</if>
-            <if test="dispAreaSite != null and dispAreaSite != ''">#{dispAreaSite},</if>
+            <if test="dispAreaId != null">#{dispAreaId},</if>
             <if test="dispAreaName != null and dispAreaName != ''">#{dispAreaName},</if>
+            <if test="dispAreaSite != null and dispAreaSite != ''">#{dispAreaSite},</if>
+            <if test="dispAreaSiteCode != null and dispAreaSiteCode != ''">#{dispAreaSiteCode},</if>
             <if test="dispAreaSiteId != null and dispAreaSiteId != ''">#{dispAreaSiteId},</if>
-            <if test="sendAreaId != null and sendAreaId != ''">#{sendAreaId},</if>
+            <if test="sendAreaId != null">#{sendAreaId},</if>
             <if test="sendAreaName != null and sendAreaName != ''">#{sendAreaName},</if>
             <if test="sendAreaSite != null and sendAreaSite != ''">#{sendAreaSite},</if>
+            <if test="sendAreaSiteCode != null and sendAreaSiteCode != ''">#{sendAreaSiteCode},</if>
             <if test="sendAreaSiteId != null and sendAreaSiteId != ''">#{sendAreaSiteId},</if>
             <if test="carriesNumber != null and carriesNumber != ''">#{carriesNumber},</if>
             <if test="discardsNumber != null and discardsNumber != ''">#{discardsNumber},</if>
@@ -209,13 +218,15 @@
             <if test="otherType2 != null and otherType2 != ''">other_type2 = #{otherType2},</if>
             <if test="carryType != null and carryType != ''">carry_type = #{carryType},</if>
             <if test="status != null">status = #{status},</if>
-            <if test="dispAreaId != null and dispAreaId != ''">disp_area_id = #{dispAreaId},</if>
-            <if test="dispAreaSite != null and dispAreaSite != ''">disp_area_site = #{dispAreaSite},</if>
+            <if test="dispAreaId != null">disp_area_id = #{dispAreaId},</if>
             <if test="dispAreaName != null and dispAreaName != ''">disp_area_name = #{dispAreaName},</if>
+            <if test="dispAreaSite != null and dispAreaSite != ''">disp_area_site = #{dispAreaSite},</if>
+            <if test="dispAreaSiteCode != null and dispAreaSiteCode != ''">disp_area_site_code = #{dispAreaSiteCode},</if>
             <if test="dispAreaSiteId != null and dispAreaSiteId != ''">disp_area_site_id = #{dispAreaSiteId},</if>
-            <if test="sendAreaId != null and sendAreaId != ''">send_area_id = #{sendAreaId},</if>
+            <if test="sendAreaId != null">send_area_id = #{sendAreaId},</if>
             <if test="sendAreaName != null and sendAreaName != ''">send_area_name = #{sendAreaName},</if>
             <if test="sendAreaSite != null and sendAreaSite != ''">send_area_site = #{sendAreaSite},</if>
+            <if test="sendAreaSiteCode != null and sendAreaSiteCode != ''">send_area_site_code = #{sendAreaSiteCode},</if>
             <if test="sendAreaSiteId != null and sendAreaSiteId != ''">send_area_site_id = #{sendAreaSiteId},</if>
             <if test="carriesNumber != null and carriesNumber != ''">carries_number = #{carriesNumber},</if>
             <if test="discardsNumber != null and discardsNumber != ''">discards_number = #{discardsNumber},</if>