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 b32c68db2..ea07161d6 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
@@ -19,6 +19,8 @@ import com.xdadan.erp.common.core.domain.TreeEntity;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import lombok.Data;
 
 
@@ -102,4 +104,6 @@ public class EmisQuotePrice extends BaseEntity
     /* 更新网点 */
     private String updateSite;
 
+    private List<EmisQuoteExpression> quoteExpressions;
+
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java
index 55c6a213b..5e6db885e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java
@@ -11,13 +11,18 @@
 package com.xdadan.erp.emis.service.impl;
 
 import java.util.List;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.xdadan.erp.emis.domain.EmisQuoteExpression;
+import com.xdadan.erp.emis.mapper.EmisQuoteExpressionMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xdadan.erp.emis.domain.EmisQuotePrice;
 import com.xdadan.erp.emis.mapper.EmisQuotePriceMapper;
 import com.xdadan.erp.emis.service.IEmisQuotePriceService;
+import org.springframework.transaction.annotation.Transactional;
 
-/**
+ /**
  * 费用报价Service业务层处理
  * 
  * @author linfso
@@ -29,6 +34,10 @@ public class EmisQuotePriceServiceImpl implements IEmisQuotePriceService
     @Autowired
     private EmisQuotePriceMapper emisQuotePriceMapper;
 
+    @Autowired
+    private EmisQuoteExpressionMapper emisQuoteExpressionMapper;
+
+
     /**
      * 查询费用报价
      * 
@@ -38,7 +47,15 @@ public class EmisQuotePriceServiceImpl implements IEmisQuotePriceService
     @Override
     public EmisQuotePrice selectEmisQuotePriceByQuoteId(Long quoteId)
     {
-        return emisQuotePriceMapper.selectEmisQuotePriceByQuoteId(quoteId);
+        EmisQuotePrice emisQuotePrice = emisQuotePriceMapper.selectEmisQuotePriceByQuoteId(quoteId);
+        if(emisQuotePrice !=null){
+            // 查询表达式
+            EmisQuoteExpression emisQuoteExpression = new EmisQuoteExpression();
+            emisQuoteExpression.setQuoteId(emisQuotePrice.getQuoteId());
+            List<EmisQuoteExpression> quoteExpressionList =emisQuoteExpressionMapper.selectEmisQuoteExpressionList(emisQuoteExpression);
+            emisQuotePrice.setQuoteExpressions(quoteExpressionList);
+        }
+        return emisQuotePrice;
     }
 
     /**
@@ -60,9 +77,24 @@ public class EmisQuotePriceServiceImpl implements IEmisQuotePriceService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertEmisQuotePrice(EmisQuotePrice emisQuotePrice)
     {
-        return emisQuotePriceMapper.insertEmisQuotePrice(emisQuotePrice);
+        // 插入主表
+        emisQuotePriceMapper.insertEmisQuotePrice(emisQuotePrice);
+
+        // 插入子表达式
+        if(CollectionUtil.isNotEmpty(emisQuotePrice.getQuoteExpressions()) ){
+            for (EmisQuoteExpression emisQuoteExpression:emisQuotePrice.getQuoteExpressions()){
+                emisQuoteExpression.setId(null);
+                emisQuoteExpression.setQuoteId(emisQuotePrice.getQuoteId());
+                emisQuoteExpressionMapper.insertEmisQuoteExpression(emisQuoteExpression);
+            }
+        }
+
+        // 插入区域
+
+        return 1;
     }
 
     /**
@@ -72,9 +104,12 @@ public class EmisQuotePriceServiceImpl implements IEmisQuotePriceService
      * @return 结果
      */
     @Override
+    @Transactional
     public int updateEmisQuotePrice(EmisQuotePrice emisQuotePrice)
     {
-        return emisQuotePriceMapper.updateEmisQuotePrice(emisQuotePrice);
+        // 更新主表
+        int ret=emisQuotePriceMapper.updateEmisQuotePrice(emisQuotePrice);
+        return ret;
     }
 
     /**
diff --git a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
index 74a35d49e..8dc01a518 100644
--- a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
@@ -104,10 +104,10 @@
         where a.quote_id = #{quoteId}
     </select>
 
-    <insert id="insertEmisQuotePrice" parameterType="EmisQuotePrice">
+
+    <insert id="insertEmisQuotePrice" parameterType="EmisQuotePrice" useGeneratedKeys="true" keyProperty="quoteId">
         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>
@@ -149,7 +149,6 @@
             <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>