diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java
index 6af2d7710..640e1956b 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java
@@ -57,7 +57,7 @@ public class EmisCustomerAddressController extends BaseController
     }
 
 //    @PreAuthorize("@ss.hasPermi('emis:emisCustomerAddress:list')")
-    @JacksonFilter(include= {"id","name","phone","country","province","city","district","countryName","provinceName","cityName","countyName","address","postCode","email","company","blDefaultFlag","orderNum","createTime","remark"},value= EmisCustomerAddress.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @JacksonFilter(include= {"id","name","phone","country","province","city","county","countryName","provinceName","cityName","countyName","address","postCode","email","company","blDefaultFlag","orderNum","createTime","remark"},value= EmisCustomerAddress.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @RequestMapping("/listSimple")
     public TableDataInfo listSimple(EmisCustomerAddress emisCustomerAddress)
     {
@@ -73,13 +73,26 @@ public class EmisCustomerAddressController extends BaseController
     }
 
 
-    @JacksonFilter(include= {"id","name","phone","country","province","city","district","countryName","provinceName","cityName","countyName","address","postCode","email","company","blDefaultFlag","orderNum","createTime","remark"},value= EmisCustomerAddress.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @JacksonFilter(include= {"id","name","phone","country","province","city","county","countryName","provinceName","cityName","countyName","address","postCode","email","company","blDefaultFlag","orderNum","createTime","remark"},value= EmisCustomerAddress.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @RequestMapping("/getAddressById")
     public AjaxResult getAddressById(@RequestParam("id") Long id)
     {
         return AjaxResult.success(emisCustomerAddressService.selectEmisCustomerAddressById(id));
     }
 
+
+    @RequestMapping("/setDefaultAddressById")
+    public AjaxResult setDefaultAddressById(@RequestParam("id") Long id)
+    {
+        return toAjax(emisCustomerAddressService.setDefaultAddressById(id));
+    }
+
+    @RequestMapping("/deleteAddressById")
+    public AjaxResult deleteAddressById(@RequestParam("id") Long id)
+    {
+        return toAjax(emisCustomerAddressService.deleteEmisCustomerAddressById(id));
+    }
+
     /**
      * 导出客户收寄件地址列表
      */
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuotePriceController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuotePriceController.java
index 0825b8620..62765c7aa 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuotePriceController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuotePriceController.java
@@ -60,6 +60,16 @@ public class EmisQuotePriceController extends BaseController
         return getDataTable(list);
     }
 
+    @RequestMapping("/calcWaybillFee")
+    public TableDataInfo calcWaybillFee(EmisQuotePrice emisQuotePrice)
+    {
+        startPage();
+        List<EmisQuotePrice> list = emisQuotePriceService.selectEmisQuotePriceList(emisQuotePrice);
+        return getDataTable(list);
+    }
+
+
+
     /**
      * 导出费用报价列表
      */
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java
index 59a186692..acaa670c7 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java
@@ -54,8 +54,8 @@ public class EmisStaffController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('system:user:list')")
     @JacksonFilter(include= {"empCode","empName","ownerSiteCode"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
-    @RequestMapping("/getPickStaffList")
-    public TableDataInfo getPickStaffList(@RequestParam("postCode")String postCode)
+    @RequestMapping("/getStaffList")
+    public TableDataInfo getStaffList(@RequestParam("postCode")String postCode)
     {
 
         Long[] postIds = null;
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerAddressMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerAddressMapper.java
index 5481b26e8..aae82de82 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerAddressMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerAddressMapper.java
@@ -13,6 +13,9 @@ package com.xdadan.erp.emis.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xdadan.erp.emis.domain.EmisCustomerAddress;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
 /**
  * @ClassName EmisCustomerAddressMapper
  * @Description <p> 客户收寄件地址 Mapper 接口 </p>
@@ -67,4 +70,10 @@ public interface EmisCustomerAddressMapper extends BaseMapper<EmisCustomerAddres
      * @return 结果
      */
     public int deleteEmisCustomerAddressByIds(Long[] ids);
+
+
+
+
+
+
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerAddressService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerAddressService.java
index dcc6f6f29..118ebbcff 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerAddressService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCustomerAddressService.java
@@ -66,4 +66,7 @@ public interface IEmisCustomerAddressService
      * @return 结果
      */
     public int deleteEmisCustomerAddressById(Long id);
+
+    public int setDefaultAddressById(Long id);
+
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java
index 1bf3906fc..6c44bdad9 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java
@@ -11,6 +11,9 @@
 package com.xdadan.erp.emis.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import org.apache.ibatis.annotations.Update;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xdadan.erp.emis.domain.EmisCustomerAddress;
@@ -101,4 +104,21 @@ public class EmisCustomerAddressServiceImpl implements IEmisCustomerAddressServi
         return emisCustomerAddressMapper.deleteEmisCustomerAddressById(id);
     }
 
+    /**
+     * 取消所有默认地址标识
+     * @return
+     */
+    @Override
+    public int setDefaultAddressById(Long id){
+        UpdateWrapper<EmisCustomerAddress> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("bl_default_flag", "0");
+        updateWrapper.eq("bl_default_flag", "1");
+        emisCustomerAddressMapper.update(null,updateWrapper);
+
+        UpdateWrapper<EmisCustomerAddress> updateWrapper2 = new UpdateWrapper<>();
+        updateWrapper2.set("bl_default_flag", "1");
+        updateWrapper.eq("id", id);
+        return emisCustomerAddressMapper.update(null,updateWrapper2);
+    }
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
index 1a0788d7b..c4f96150c 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
@@ -57,6 +57,7 @@
     <select id="selectEmisCustomerAddressList" parameterType="EmisCustomerAddress" resultMap="EmisCustomerAddressResult">
         <include refid="selectEmisCustomerAddressVo"/>
         <where>
+            del_flag = '0'
             <if test="id != null "> and id = #{id}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="customerCode != null  and customerCode != ''"> and customer_code =#{customerCode}</if>
@@ -200,11 +201,11 @@
     </update>
 
     <delete id="deleteEmisCustomerAddressById" parameterType="Long">
-        delete from emis_customer_address where id = #{id}
+        update emis_customer_address set del_flag='1' where id = #{id}
     </delete>
-
+    <!--修改为不能删除地址-->
     <delete id="deleteEmisCustomerAddressByIds" parameterType="String">
-        delete from emis_customer_address where id in
+        update emis_customer_address set del_flag='1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>