diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionExpressionController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionExpressionController.java
new file mode 100644
index 000000000..37416d2d0
--- /dev/null
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionExpressionController.java
@@ -0,0 +1,134 @@
+
+/** 
+  * @Project: emis
+  * @Title: EmisCommissionExpressionController.java
+  * @author linfso
+  * @date 2024-09-04 00:32:28
+  * @Copyright: ShangHai Duta 2022 All rights reserved.
+  * @version v1.0  
+  * @Description: <p> 计提计算表达式 控制器 </p>
+ */
+
+package com.xdadan.erp.web.emis;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.xdadan.erp.common.annotation.Log;
+import com.xdadan.erp.common.core.controller.BaseController;
+import com.xdadan.erp.common.core.domain.AjaxResult;
+import com.xdadan.erp.common.core.page.TableDataInfo;
+import com.xdadan.erp.common.enums.BusinessType;
+import com.xdadan.erp.common.utils.StringUtils;
+import com.xdadan.erp.common.utils.poi.ExcelUtil;
+
+import com.xdadan.erp.emis.domain.EmisCommissionExpression;
+import com.xdadan.erp.emis.service.IEmisCommissionExpressionService;
+
+/**
+ * 计提计算表达式Controller
+ * 
+ * @author linfso
+ * @date 2024-09-04 00:32:28
+ */
+@RestController
+@RequestMapping("/emis/emisCommissionExpression")
+public class EmisCommissionExpressionController extends BaseController
+{
+    @Autowired
+    private IEmisCommissionExpressionService emisCommissionExpressionService;
+
+    /**
+     * 查询计提计算表达式列表
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisCommissionExpression:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(EmisCommissionExpression emisCommissionExpression)
+    {
+        startPage();
+        List<EmisCommissionExpression> list = emisCommissionExpressionService.selectEmisCommissionExpressionList(emisCommissionExpression);
+        return getDataTable(list);
+    }
+
+
+     /**
+     * 检查是否重复
+     * 
+     * @param emisCommissionExpression 
+     * @return 数量
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisCommissionExpression:list')")
+    @GetMapping("/checkUnique")
+    public AjaxResult checkUnique(EmisCommissionExpression emisCommissionExpression)
+    {
+        int cnt=emisCommissionExpressionService.checkUnique(emisCommissionExpression);
+        return AjaxResult.success("检查成功",cnt);
+    }
+
+
+    /**
+     * 导出计提计算表达式列表
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisCommissionExpression:export')")
+    @Log(title = "计提计算表达式", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, EmisCommissionExpression emisCommissionExpression)
+    {
+        List<EmisCommissionExpression> list = emisCommissionExpressionService.selectEmisCommissionExpressionList(emisCommissionExpression);
+        ExcelUtil<EmisCommissionExpression> util = new ExcelUtil<EmisCommissionExpression>(EmisCommissionExpression.class);
+        util.exportExcel(response, list, "计提计算表达式数据");
+    }
+
+    /**
+     * 获取计提计算表达式详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisCommissionExpression:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(emisCommissionExpressionService.selectEmisCommissionExpressionById(id));
+    }
+
+    /**
+     * 新增计提计算表达式
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisCommissionExpression:add')")
+    @Log(title = "计提计算表达式", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EmisCommissionExpression emisCommissionExpression)
+    {
+        return toAjax(emisCommissionExpressionService.insertEmisCommissionExpression(emisCommissionExpression));
+    }
+
+    /**
+     * 修改计提计算表达式
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisCommissionExpression:edit')")
+    @Log(title = "计提计算表达式", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EmisCommissionExpression emisCommissionExpression)
+    {
+        return toAjax(emisCommissionExpressionService.updateEmisCommissionExpression(emisCommissionExpression));
+    }
+
+    /**
+     * 删除计提计算表达式
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisCommissionExpression:remove')")
+    @Log(title = "计提计算表达式", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(emisCommissionExpressionService.deleteEmisCommissionExpressionByIds(ids));
+    }
+}
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionQuoteController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionQuoteController.java
new file mode 100644
index 000000000..f3afb75ac
--- /dev/null
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionQuoteController.java
@@ -0,0 +1,134 @@
+
+/** 
+  * @Project: emis
+  * @Title: EmisCommissionQuoteController.java
+  * @author linfso
+  * @date 2024-09-04 00:32:29
+  * @Copyright: ShangHai Duta 2022 All rights reserved.
+  * @version v1.0  
+  * @Description: <p> 员工提成方案报价 控制器 </p>
+ */
+
+package com.xdadan.erp.web.emis;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.xdadan.erp.common.annotation.Log;
+import com.xdadan.erp.common.core.controller.BaseController;
+import com.xdadan.erp.common.core.domain.AjaxResult;
+import com.xdadan.erp.common.core.page.TableDataInfo;
+import com.xdadan.erp.common.enums.BusinessType;
+import com.xdadan.erp.common.utils.StringUtils;
+import com.xdadan.erp.common.utils.poi.ExcelUtil;
+
+import com.xdadan.erp.emis.domain.EmisCommissionQuote;
+import com.xdadan.erp.emis.service.IEmisCommissionQuoteService;
+
+/**
+ * 员工提成方案报价Controller
+ * 
+ * @author linfso
+ * @date 2024-09-04 00:32:29
+ */
+@RestController
+@RequestMapping("/emis/emisCommissionQuote")
+public class EmisCommissionQuoteController extends BaseController
+{
+    @Autowired
+    private IEmisCommissionQuoteService emisCommissionQuoteService;
+
+    /**
+     * 查询员工提成方案报价列表
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisCommissionQuote:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(EmisCommissionQuote emisCommissionQuote)
+    {
+        startPage();
+        List<EmisCommissionQuote> list = emisCommissionQuoteService.selectEmisCommissionQuoteList(emisCommissionQuote);
+        return getDataTable(list);
+    }
+
+
+     /**
+     * 检查是否重复
+     * 
+     * @param emisCommissionQuote 
+     * @return 数量
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisCommissionQuote:list')")
+    @GetMapping("/checkUnique")
+    public AjaxResult checkUnique(EmisCommissionQuote emisCommissionQuote)
+    {
+        int cnt=emisCommissionQuoteService.checkUnique(emisCommissionQuote);
+        return AjaxResult.success("检查成功",cnt);
+    }
+
+
+    /**
+     * 导出员工提成方案报价列表
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisCommissionQuote:export')")
+    @Log(title = "员工提成方案报价", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, EmisCommissionQuote emisCommissionQuote)
+    {
+        List<EmisCommissionQuote> list = emisCommissionQuoteService.selectEmisCommissionQuoteList(emisCommissionQuote);
+        ExcelUtil<EmisCommissionQuote> util = new ExcelUtil<EmisCommissionQuote>(EmisCommissionQuote.class);
+        util.exportExcel(response, list, "员工提成方案报价数据");
+    }
+
+    /**
+     * 获取员工提成方案报价详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisCommissionQuote:query')")
+    @GetMapping(value = "/{quoteId}")
+    public AjaxResult getInfo(@PathVariable("quoteId") Long quoteId)
+    {
+        return AjaxResult.success(emisCommissionQuoteService.selectEmisCommissionQuoteByQuoteId(quoteId));
+    }
+
+    /**
+     * 新增员工提成方案报价
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisCommissionQuote:add')")
+    @Log(title = "员工提成方案报价", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EmisCommissionQuote emisCommissionQuote)
+    {
+        return toAjax(emisCommissionQuoteService.insertEmisCommissionQuote(emisCommissionQuote));
+    }
+
+    /**
+     * 修改员工提成方案报价
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisCommissionQuote:edit')")
+    @Log(title = "员工提成方案报价", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EmisCommissionQuote emisCommissionQuote)
+    {
+        return toAjax(emisCommissionQuoteService.updateEmisCommissionQuote(emisCommissionQuote));
+    }
+
+    /**
+     * 删除员工提成方案报价
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisCommissionQuote:remove')")
+    @Log(title = "员工提成方案报价", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{quoteIds}")
+    public AjaxResult remove(@PathVariable Long[] quoteIds)
+    {
+        return toAjax(emisCommissionQuoteService.deleteEmisCommissionQuoteByQuoteIds(quoteIds));
+    }
+}
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
index 96d6d1ce2..ce6f6de44 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
@@ -415,7 +415,11 @@ public class EmisSettleSubBillController extends EmisBaseController
                         return AjaxResult.error("账单不存在:"+old.getBillCode());
                     }
 
-                    if("0086".equals(old.getWaybillDetail().getReceiveCountry())){
+                    if("0086".equals(old.getWaybillDetail().getReceiveCountry())
+                            && (
+                                    "2".equals(old.getWaybillDetail().getPaymentType())
+                                            ||  "4".equals(old.getWaybillDetail().getPaymentType())
+                                            ||  "5".equals(old.getWaybillDetail().getPaymentType()) ) ){
                         Date sendDate=WaybillHelper.removeTimeHMS(old.getWaybillDetail().getSendDate());
                         Date now=WaybillHelper.removeTimeHMS(new Date());
                         Long num=now.getTime()-sendDate.getTime();//时间戳相差的毫秒数
@@ -461,6 +465,17 @@ public class EmisSettleSubBillController extends EmisBaseController
             for(int i=0;i<ids.length;i++){
                 try {
                     long id=ids[i];
+
+
+                    EmisSettleSubBill old=emisSettleSubBillService.selectEmisSettleSubBillById(id);
+                    if(old==null){
+                        return AjaxResult.error("账单不存在:"+old.getBillCode());
+                    }
+
+                    if("1".equals(old.getBlConfirmCenter())){
+                        return AjaxResult.error("财务已确认，无法取消:"+old.getBillCode());
+                    }
+
                     EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill();
                     emisSettleSubBill.setConfirmSiteManCode(getLoginUser().getUser().getEmpCode());
                     emisSettleSubBill.setConfirmSiteCode(getLoginUser().getUser().getOwnerSiteCode());
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionExpression.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionExpression.java
new file mode 100644
index 000000000..668bff291
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionExpression.java
@@ -0,0 +1,61 @@
+/** 
+ * @Project: emis
+ * @Title: EmisCommissionExpression.java
+ * @author linfso
+ * @date 2024-09-04 00:32:28
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 计提计算表达式 实体类 </p>
+ */
+
+package com.xdadan.erp.emis.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.xdadan.erp.common.annotation.Excel;
+import com.xdadan.erp.common.core.domain.BaseEntity;
+import com.xdadan.erp.common.core.domain.TreeEntity;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * @ClassName EmisCommissionExpression
+ * @Description 计提计算表达式
+ * @author linfso
+ * @date 2024-09-04 00:32:28
+ */
+ @Data
+public class EmisCommissionExpression extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /* 序号 */
+    private Long id;
+    /* 报价ID */
+    private Long quoteId;
+    /* 报价序号 */
+    private Integer quoteSequence;
+    /* 使用站点代码 */
+    private String useSiteCode;
+    /* 使用站点名称 */
+    private String useSite;
+    /* 起始重量 */
+    private Double startWeight;
+    /* 结束重量 */
+    private Double endWeight;
+    /* 首重 */
+    private Double initialWeight;
+    /* 续重 */
+    private Double additionalWeight;
+    /* 条件表达式 */
+    private String conditionExpression;
+    /* 计算表达式 */
+    private String calculateExpression;
+    /* 启用状态 0-启用 1-停用 */
+    private Integer status;
+
+}
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
new file mode 100644
index 000000000..0cf8d5169
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java
@@ -0,0 +1,63 @@
+/** 
+ * @Project: emis
+ * @Title: EmisCommissionQuote.java
+ * @author linfso
+ * @date 2024-09-04 00:32:29
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 员工提成方案报价 实体类 </p>
+ */
+
+package com.xdadan.erp.emis.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.xdadan.erp.common.annotation.Excel;
+import com.xdadan.erp.common.core.domain.BaseEntity;
+import com.xdadan.erp.common.core.domain.TreeEntity;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * @ClassName EmisCommissionQuote
+ * @Description 员工提成方案报价
+ * @author linfso
+ * @date 2024-09-04 00:32:29
+ */
+ @Data
+public class EmisCommissionQuote extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /* 序号 */
+    private Long quoteId;
+    /* 提成方案编码 */
+    private String quoteCode;
+    /* 提成方案名称 */
+    private String quoteName;
+    /* 计算类型 票，重量 emis_commission_type */
+    private String calcType;
+    /* 岗位类型:emis_commission_post */
+    private String postType;
+    /* 快递类型:emis_biz_shipping_method */
+    private String transType;
+    /* 启用状态 1-启用 0-停用 */
+    private String blOpen;
+    /* 员工编号 */
+    private String empCode;
+    /* 员工名称 */
+    private String empName;
+    /* 开始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startDate;
+    /* 结束日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endDate;
+    /* 优先级 */
+    private Integer priorityLevel;
+
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCommissionExpressionMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCommissionExpressionMapper.java
new file mode 100644
index 000000000..c87f5bfd2
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCommissionExpressionMapper.java
@@ -0,0 +1,80 @@
+/** 
+ * @Project: emis
+ * @Title: EmisCommissionExpressionMapper.java
+ * @author linfso
+ * @date 2024-09-04 00:32:28
+ * @Copyright: ShangHai Doitinfo 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 计提计算表达式 Mapper 接口 </p>
+ *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
+ */
+package com.xdadan.erp.emis.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xdadan.erp.emis.domain.EmisCommissionExpression;
+/**
+ * @ClassName EmisCommissionExpressionMapper
+ * @Description <p> 计提计算表达式 Mapper 接口 </p>
+ * @author linfso
+ * @date 2024-09-04 00:32:28
+ */
+public interface EmisCommissionExpressionMapper extends BaseMapper<EmisCommissionExpression>
+{
+    /**
+     * 主键查询
+     * @param  id
+     * @return 
+     */
+    public EmisCommissionExpression selectEmisCommissionExpressionById(Long id);
+
+    /**
+     * 查询列表
+     * 
+     * @param emisCommissionExpression 
+     * @return 集合
+     */
+    public List<EmisCommissionExpression> selectEmisCommissionExpressionList(EmisCommissionExpression emisCommissionExpression);
+
+
+     /**
+     * 检查是否重复
+     * 
+     * @param emisCommissionExpression 
+     * @return 数量
+     */
+    public int checkUnique(EmisCommissionExpression emisCommissionExpression);
+    
+
+    /**
+     * 新增 
+     * 
+     * @param emisCommissionExpression
+     * @return 
+     */
+    public int insertEmisCommissionExpression(EmisCommissionExpression emisCommissionExpression);
+
+    /**
+     * 修改
+     * 
+     * @param emisCommissionExpression 
+     * @return 
+     */
+    public int updateEmisCommissionExpression(EmisCommissionExpression emisCommissionExpression);
+
+    /**
+     * 删除
+     * 
+     * @param id 主键
+     * @return 结果
+     */
+    public int deleteEmisCommissionExpressionById(Long id);
+
+    /**
+     * 批量删除
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEmisCommissionExpressionByIds(Long[] ids);
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCommissionQuoteMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCommissionQuoteMapper.java
new file mode 100644
index 000000000..46c6b0392
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCommissionQuoteMapper.java
@@ -0,0 +1,80 @@
+/** 
+ * @Project: emis
+ * @Title: EmisCommissionQuoteMapper.java
+ * @author linfso
+ * @date 2024-09-04 00:32:29
+ * @Copyright: ShangHai Doitinfo 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 员工提成方案报价 Mapper 接口 </p>
+ *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
+ */
+package com.xdadan.erp.emis.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xdadan.erp.emis.domain.EmisCommissionQuote;
+/**
+ * @ClassName EmisCommissionQuoteMapper
+ * @Description <p> 员工提成方案报价 Mapper 接口 </p>
+ * @author linfso
+ * @date 2024-09-04 00:32:29
+ */
+public interface EmisCommissionQuoteMapper extends BaseMapper<EmisCommissionQuote>
+{
+    /**
+     * 主键查询
+     * @param  quoteId
+     * @return 
+     */
+    public EmisCommissionQuote selectEmisCommissionQuoteByQuoteId(Long quoteId);
+
+    /**
+     * 查询列表
+     * 
+     * @param emisCommissionQuote 
+     * @return 集合
+     */
+    public List<EmisCommissionQuote> selectEmisCommissionQuoteList(EmisCommissionQuote emisCommissionQuote);
+
+
+     /**
+     * 检查是否重复
+     * 
+     * @param emisCommissionQuote 
+     * @return 数量
+     */
+    public int checkUnique(EmisCommissionQuote emisCommissionQuote);
+    
+
+    /**
+     * 新增 
+     * 
+     * @param emisCommissionQuote
+     * @return 
+     */
+    public int insertEmisCommissionQuote(EmisCommissionQuote emisCommissionQuote);
+
+    /**
+     * 修改
+     * 
+     * @param emisCommissionQuote 
+     * @return 
+     */
+    public int updateEmisCommissionQuote(EmisCommissionQuote emisCommissionQuote);
+
+    /**
+     * 删除
+     * 
+     * @param quoteId 主键
+     * @return 结果
+     */
+    public int deleteEmisCommissionQuoteByQuoteId(Long quoteId);
+
+    /**
+     * 批量删除
+     * 
+     * @param quoteIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEmisCommissionQuoteByQuoteIds(Long[] quoteIds);
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionExpressionService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionExpressionService.java
new file mode 100644
index 000000000..582315ea6
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionExpressionService.java
@@ -0,0 +1,78 @@
+ /** 
+ * @Project: emis
+ * @Title: EmisCommissionExpressionService.java
+ * @author linfso
+ * @date 2024-09-04 00:32:28
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 计提计算表达式 服务类接口 </p>
+ */
+package com.xdadan.erp.emis.service;
+
+import java.util.List;
+import com.xdadan.erp.emis.domain.EmisCommissionExpression;
+
+/**
+ * @ClassName EmisCommissionExpressionService
+ * @Description 计提计算表达式
+ * @author linfso
+ * @date 2024-09-04 00:32:28
+ */
+public interface IEmisCommissionExpressionService 
+{
+   /**
+     * 主键查询
+     * @param id
+     * @return 
+     */
+    public EmisCommissionExpression selectEmisCommissionExpressionById(Long id);
+
+    /**
+     * 查询计提计算表达式列表
+     * 
+     * @param emisCommissionExpression 计提计算表达式
+     * @return 计提计算表达式集合
+     */
+    public List<EmisCommissionExpression> selectEmisCommissionExpressionList(EmisCommissionExpression emisCommissionExpression);
+
+
+    /**
+     * 检查是否重复
+     * 
+     * @param emisCommissionExpression 
+     * @return 数量
+     */
+    public int checkUnique(EmisCommissionExpression emisCommissionExpression);
+
+    /**
+     * 新增计提计算表达式
+     * 
+     * @param emisCommissionExpression 计提计算表达式
+     * @return 结果
+     */
+    public int insertEmisCommissionExpression(EmisCommissionExpression emisCommissionExpression);
+
+    /**
+     * 修改计提计算表达式
+     * 
+     * @param emisCommissionExpression 计提计算表达式
+     * @return 结果
+     */
+    public int updateEmisCommissionExpression(EmisCommissionExpression emisCommissionExpression);
+
+    /**
+     * 批量删除计提计算表达式
+     * 
+     * @param ids 需要删除的计提计算表达式主键集合
+     * @return 结果
+     */
+    public int deleteEmisCommissionExpressionByIds(Long[] ids);
+
+    /**
+     * 删除计提计算表达式信息
+     * 
+     * @param id 计提计算表达式主键
+     * @return 结果
+     */
+    public int deleteEmisCommissionExpressionById(Long id);
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionQuoteService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionQuoteService.java
new file mode 100644
index 000000000..705df1456
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionQuoteService.java
@@ -0,0 +1,78 @@
+ /** 
+ * @Project: emis
+ * @Title: EmisCommissionQuoteService.java
+ * @author linfso
+ * @date 2024-09-04 00:32:29
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 员工提成方案报价 服务类接口 </p>
+ */
+package com.xdadan.erp.emis.service;
+
+import java.util.List;
+import com.xdadan.erp.emis.domain.EmisCommissionQuote;
+
+/**
+ * @ClassName EmisCommissionQuoteService
+ * @Description 员工提成方案报价
+ * @author linfso
+ * @date 2024-09-04 00:32:29
+ */
+public interface IEmisCommissionQuoteService 
+{
+   /**
+     * 主键查询
+     * @param quoteId
+     * @return 
+     */
+    public EmisCommissionQuote selectEmisCommissionQuoteByQuoteId(Long quoteId);
+
+    /**
+     * 查询员工提成方案报价列表
+     * 
+     * @param emisCommissionQuote 员工提成方案报价
+     * @return 员工提成方案报价集合
+     */
+    public List<EmisCommissionQuote> selectEmisCommissionQuoteList(EmisCommissionQuote emisCommissionQuote);
+
+
+    /**
+     * 检查是否重复
+     * 
+     * @param emisCommissionQuote 
+     * @return 数量
+     */
+    public int checkUnique(EmisCommissionQuote emisCommissionQuote);
+
+    /**
+     * 新增员工提成方案报价
+     * 
+     * @param emisCommissionQuote 员工提成方案报价
+     * @return 结果
+     */
+    public int insertEmisCommissionQuote(EmisCommissionQuote emisCommissionQuote);
+
+    /**
+     * 修改员工提成方案报价
+     * 
+     * @param emisCommissionQuote 员工提成方案报价
+     * @return 结果
+     */
+    public int updateEmisCommissionQuote(EmisCommissionQuote emisCommissionQuote);
+
+    /**
+     * 批量删除员工提成方案报价
+     * 
+     * @param quoteIds 需要删除的员工提成方案报价主键集合
+     * @return 结果
+     */
+    public int deleteEmisCommissionQuoteByQuoteIds(Long[] quoteIds);
+
+    /**
+     * 删除员工提成方案报价信息
+     * 
+     * @param quoteId 员工提成方案报价主键
+     * @return 结果
+     */
+    public int deleteEmisCommissionQuoteByQuoteId(Long quoteId);
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionExpressionServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionExpressionServiceImpl.java
new file mode 100644
index 000000000..961ced313
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionExpressionServiceImpl.java
@@ -0,0 +1,117 @@
+ /** 
+ * @Project: emis
+ * @Title: EmisCommissionExpressionServiceImpl.java
+ * @author linfso
+ * @date 2024-09-04 00:32:28
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 计提计算表达式 实体类 </p>
+ */
+
+package com.xdadan.erp.emis.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.xdadan.erp.emis.domain.EmisCommissionExpression;
+import com.xdadan.erp.emis.mapper.EmisCommissionExpressionMapper;
+import com.xdadan.erp.emis.service.IEmisCommissionExpressionService;
+
+/**
+ * 计提计算表达式Service业务层处理
+ * 
+ * @author linfso
+ * @date 2024-09-04 00:32:28
+ */
+@Service
+public class EmisCommissionExpressionServiceImpl implements IEmisCommissionExpressionService 
+{
+    @Autowired
+    private EmisCommissionExpressionMapper emisCommissionExpressionMapper;
+
+    /**
+     * 查询计提计算表达式
+     * 
+     * @param id 计提计算表达式主键
+     * @return 计提计算表达式
+     */
+    @Override
+    public EmisCommissionExpression selectEmisCommissionExpressionById(Long id)
+    {
+        return emisCommissionExpressionMapper.selectEmisCommissionExpressionById(id);
+    }
+
+
+    /**
+     * 查询计提计算表达式列表
+     * 
+     * @param emisCommissionExpression 计提计算表达式
+     * @return 计提计算表达式
+     */
+    @Override
+    public List<EmisCommissionExpression> selectEmisCommissionExpressionList(EmisCommissionExpression emisCommissionExpression)
+    {
+        return emisCommissionExpressionMapper.selectEmisCommissionExpressionList(emisCommissionExpression);
+    }
+
+    /**
+     * 检查是否重复
+     * 
+     * @param emisCommissionExpression 
+     * @return 数量
+     */
+    @Override
+    public int checkUnique(EmisCommissionExpression emisCommissionExpression)
+    {
+         return emisCommissionExpressionMapper.checkUnique(emisCommissionExpression);
+    }
+
+    /**
+     * 新增计提计算表达式
+     * 
+     * @param emisCommissionExpression 计提计算表达式
+     * @return 结果
+     */
+    @Override
+    public int insertEmisCommissionExpression(EmisCommissionExpression emisCommissionExpression)
+    {
+        return emisCommissionExpressionMapper.insertEmisCommissionExpression(emisCommissionExpression);
+    }
+
+    /**
+     * 修改计提计算表达式
+     * 
+     * @param emisCommissionExpression 计提计算表达式
+     * @return 结果
+     */
+    @Override
+    public int updateEmisCommissionExpression(EmisCommissionExpression emisCommissionExpression)
+    {
+        return emisCommissionExpressionMapper.updateEmisCommissionExpression(emisCommissionExpression);
+    }
+
+    /**
+     * 批量删除计提计算表达式
+     * 
+     * @param ids 需要删除的计提计算表达式主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmisCommissionExpressionByIds(Long[] ids)
+    {
+        return emisCommissionExpressionMapper.deleteEmisCommissionExpressionByIds(ids);
+    }
+
+    /**
+     * 删除计提计算表达式信息
+     * 
+     * @param id 计提计算表达式主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmisCommissionExpressionById(Long id)
+    {
+        return emisCommissionExpressionMapper.deleteEmisCommissionExpressionById(id);
+    }
+
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionQuoteServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionQuoteServiceImpl.java
new file mode 100644
index 000000000..efa5ab0db
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionQuoteServiceImpl.java
@@ -0,0 +1,117 @@
+ /** 
+ * @Project: emis
+ * @Title: EmisCommissionQuoteServiceImpl.java
+ * @author linfso
+ * @date 2024-09-04 00:32:29
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 员工提成方案报价 实体类 </p>
+ */
+
+package com.xdadan.erp.emis.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.xdadan.erp.emis.domain.EmisCommissionQuote;
+import com.xdadan.erp.emis.mapper.EmisCommissionQuoteMapper;
+import com.xdadan.erp.emis.service.IEmisCommissionQuoteService;
+
+/**
+ * 员工提成方案报价Service业务层处理
+ * 
+ * @author linfso
+ * @date 2024-09-04 00:32:29
+ */
+@Service
+public class EmisCommissionQuoteServiceImpl implements IEmisCommissionQuoteService 
+{
+    @Autowired
+    private EmisCommissionQuoteMapper emisCommissionQuoteMapper;
+
+    /**
+     * 查询员工提成方案报价
+     * 
+     * @param quoteId 员工提成方案报价主键
+     * @return 员工提成方案报价
+     */
+    @Override
+    public EmisCommissionQuote selectEmisCommissionQuoteByQuoteId(Long quoteId)
+    {
+        return emisCommissionQuoteMapper.selectEmisCommissionQuoteByQuoteId(quoteId);
+    }
+
+
+    /**
+     * 查询员工提成方案报价列表
+     * 
+     * @param emisCommissionQuote 员工提成方案报价
+     * @return 员工提成方案报价
+     */
+    @Override
+    public List<EmisCommissionQuote> selectEmisCommissionQuoteList(EmisCommissionQuote emisCommissionQuote)
+    {
+        return emisCommissionQuoteMapper.selectEmisCommissionQuoteList(emisCommissionQuote);
+    }
+
+    /**
+     * 检查是否重复
+     * 
+     * @param emisCommissionQuote 
+     * @return 数量
+     */
+    @Override
+    public int checkUnique(EmisCommissionQuote emisCommissionQuote)
+    {
+         return emisCommissionQuoteMapper.checkUnique(emisCommissionQuote);
+    }
+
+    /**
+     * 新增员工提成方案报价
+     * 
+     * @param emisCommissionQuote 员工提成方案报价
+     * @return 结果
+     */
+    @Override
+    public int insertEmisCommissionQuote(EmisCommissionQuote emisCommissionQuote)
+    {
+        return emisCommissionQuoteMapper.insertEmisCommissionQuote(emisCommissionQuote);
+    }
+
+    /**
+     * 修改员工提成方案报价
+     * 
+     * @param emisCommissionQuote 员工提成方案报价
+     * @return 结果
+     */
+    @Override
+    public int updateEmisCommissionQuote(EmisCommissionQuote emisCommissionQuote)
+    {
+        return emisCommissionQuoteMapper.updateEmisCommissionQuote(emisCommissionQuote);
+    }
+
+    /**
+     * 批量删除员工提成方案报价
+     * 
+     * @param quoteIds 需要删除的员工提成方案报价主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmisCommissionQuoteByQuoteIds(Long[] quoteIds)
+    {
+        return emisCommissionQuoteMapper.deleteEmisCommissionQuoteByQuoteIds(quoteIds);
+    }
+
+    /**
+     * 删除员工提成方案报价信息
+     * 
+     * @param quoteId 员工提成方案报价主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmisCommissionQuoteByQuoteId(Long quoteId)
+    {
+        return emisCommissionQuoteMapper.deleteEmisCommissionQuoteByQuoteId(quoteId);
+    }
+
+}
diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionExpressionMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionExpressionMapper.xml
new file mode 100644
index 000000000..8fc5d0255
--- /dev/null
+++ b/emis-biz/src/main/resources/mapper/EmisCommissionExpressionMapper.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xdadan.erp.emis.mapper.EmisCommissionExpressionMapper">
+    
+    <resultMap type="EmisCommissionExpression" id="EmisCommissionExpressionResult">
+        <result property="id"    column="id"    />
+        <result property="quoteId"    column="quote_id"    />
+        <result property="quoteSequence"    column="quote_sequence"    />
+        <result property="useSiteCode"    column="use_site_code"    />
+        <result property="useSite"    column="use_site"    />
+        <result property="startWeight"    column="start_weight"    />
+        <result property="endWeight"    column="end_weight"    />
+        <result property="initialWeight"    column="initial_weight"    />
+        <result property="additionalWeight"    column="additional_weight"    />
+        <result property="conditionExpression"    column="condition_expression"    />
+        <result property="calculateExpression"    column="calculate_expression"    />
+        <result property="status"    column="status"    />
+    </resultMap>
+
+    <sql id="selectEmisCommissionExpressionVo">
+        select id, quote_id, quote_sequence, use_site_code, use_site, start_weight, end_weight, initial_weight, additional_weight, condition_expression, calculate_expression, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_commission_expression
+    </sql>
+
+    <select id="selectEmisCommissionExpressionList" parameterType="EmisCommissionExpression" resultMap="EmisCommissionExpressionResult">
+        <include refid="selectEmisCommissionExpressionVo"/>
+        <where>  
+             del_flag='0'
+            <if test="id != null "> and id = #{id}</if>
+            <if test="quoteId != null "> and quote_id = #{quoteId}</if>
+            <if test="quoteSequence != null "> and quote_sequence = #{quoteSequence}</if>
+            <if test="useSiteCode != null  and useSiteCode != ''"> and use_site_code like concat('%', #{useSiteCode}, '%')</if>
+            <if test="useSite != null  and useSite != ''"> and use_site like concat('%', #{useSite}, '%')</if>
+            <if test="startWeight != null "> and start_weight = #{startWeight}</if>
+            <if test="endWeight != null "> and end_weight = #{endWeight}</if>
+            <if test="initialWeight != null "> and initial_weight = #{initialWeight}</if>
+            <if test="additionalWeight != null "> and additional_weight = #{additionalWeight}</if>
+            <if test="conditionExpression != null  and conditionExpression != ''"> and condition_expression like concat('%', #{conditionExpression}, '%')</if>
+            <if test="calculateExpression != null  and calculateExpression != ''"> and calculate_expression like concat('%', #{calculateExpression}, '%')</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
+            <if test="tenantId != null  and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</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>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="checkUnique" parameterType="EmisCommissionExpression"  resultType="int">
+		select count(1) from  emis_commission_expression
+		where del_flag='0'
+           and id = #{id}
+           and quote_id = #{quoteId}
+           and quote_sequence = #{quoteSequence}
+           and use_site_code = #{useSiteCode}
+           and use_site = #{useSite}
+           and start_weight = #{startWeight}
+           and end_weight = #{endWeight}
+           and initial_weight = #{initialWeight}
+           and additional_weight = #{additionalWeight}
+           and condition_expression = #{conditionExpression}
+           and calculate_expression = #{calculateExpression}
+           and status = #{status}
+           and remark = #{remark}
+           and tenant_id = #{tenantId}
+           and del_flag = #{delFlag}
+           and create_by = #{createBy}
+           and create_time = #{createTime}
+           and update_by = #{updateBy}
+           and update_time = #{updateTime}
+           and create_site = #{createSite}
+           and update_site = #{updateSite}
+		limit 1
+	</select>
+  
+    <select id="selectEmisCommissionExpressionById" parameterType="Long" resultMap="EmisCommissionExpressionResult">
+        select id, quote_id, quote_sequence, use_site_code, use_site, start_weight, end_weight, initial_weight, additional_weight, condition_expression, calculate_expression, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
+        from emis_commission_expression a
+        where a.id = #{id}
+    </select>
+        
+    <insert id="insertEmisCommissionExpression" parameterType="EmisCommissionExpression" useGeneratedKeys="true" keyProperty="id">
+        insert into emis_commission_expression
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="quoteId != null">quote_id,</if>
+            <if test="quoteSequence != null">quote_sequence,</if>
+            <if test="useSiteCode != null and useSiteCode != ''">use_site_code,</if>
+            <if test="useSite != null and useSite != ''">use_site,</if>
+            <if test="startWeight != null">start_weight,</if>
+            <if test="endWeight != null">end_weight,</if>
+            <if test="initialWeight != null">initial_weight,</if>
+            <if test="additionalWeight != null">additional_weight,</if>
+            <if test="conditionExpression != null and conditionExpression != ''">condition_expression,</if>
+            <if test="calculateExpression != null and calculateExpression != ''">calculate_expression,</if>
+            <if test="status != null">status,</if>
+            <if test="remark != null and remark != ''">remark,</if>
+            <if test="tenantId != null and tenantId != ''">tenant_id,</if>
+            <if test="delFlag != null and delFlag != ''">del_flag,</if>
+            <if test="createBy != null and createBy != ''">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null and updateBy != ''">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createSite != null and createSite != ''">create_site,</if>
+            <if test="updateSite != null and updateSite != ''">update_site,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="quoteId != null">#{quoteId},</if>
+            <if test="quoteSequence != null">#{quoteSequence},</if>
+            <if test="useSiteCode != null and useSiteCode != ''">#{useSiteCode},</if>
+            <if test="useSite != null and useSite != ''">#{useSite},</if>
+            <if test="startWeight != null">#{startWeight},</if>
+            <if test="endWeight != null">#{endWeight},</if>
+            <if test="initialWeight != null">#{initialWeight},</if>
+            <if test="additionalWeight != null">#{additionalWeight},</if>
+            <if test="conditionExpression != null and conditionExpression != ''">#{conditionExpression},</if>
+            <if test="calculateExpression != null and calculateExpression != ''">#{calculateExpression},</if>
+            <if test="status != null">#{status},</if>
+            <if test="remark != null and remark != ''">#{remark},</if>
+            <if test="tenantId != null and tenantId != ''">#{tenantId},</if>
+            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+            <if test="createBy != null and createBy != ''">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createSite != null and createSite != ''">#{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
+         </trim>
+    </insert>
+
+    <update id="updateEmisCommissionExpression" parameterType="EmisCommissionExpression">
+        update emis_commission_expression
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="quoteId != null">quote_id = #{quoteId},</if>
+            <if test="quoteSequence != null">quote_sequence = #{quoteSequence},</if>
+            <if test="useSiteCode != null and useSiteCode != ''">use_site_code = #{useSiteCode},</if>
+            <if test="useSite != null and useSite != ''">use_site = #{useSite},</if>
+            <if test="startWeight != null">start_weight = #{startWeight},</if>
+            <if test="endWeight != null">end_weight = #{endWeight},</if>
+            <if test="initialWeight != null">initial_weight = #{initialWeight},</if>
+            <if test="additionalWeight != null">additional_weight = #{additionalWeight},</if>
+            <if test="conditionExpression != null and conditionExpression != ''">condition_expression = #{conditionExpression},</if>
+            <if test="calculateExpression != null and calculateExpression != ''">calculate_expression = #{calculateExpression},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteEmisCommissionExpressionById" parameterType="Long">
+        delete from emis_commission_expression where id = #{id}
+    </delete>
+
+    <delete id="deleteEmisCommissionExpressionByIds" parameterType="String">
+        delete from emis_commission_expression where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
new file mode 100644
index 000000000..b9b714ecc
--- /dev/null
+++ b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xdadan.erp.emis.mapper.EmisCommissionQuoteMapper">
+    
+    <resultMap type="EmisCommissionQuote" id="EmisCommissionQuoteResult">
+        <result property="quoteId"    column="quote_id"    />
+        <result property="quoteCode"    column="quote_code"    />
+        <result property="quoteName"    column="quote_name"    />
+        <result property="calcType"    column="calc_type"    />
+        <result property="postType"    column="post_type"    />
+        <result property="transType"    column="trans_type"    />
+        <result property="blOpen"    column="bl_open"    />
+        <result property="empCode"    column="emp_code"    />
+        <result property="empName"    column="emp_name"    />
+        <result property="startDate"    column="start_date"    />
+        <result property="endDate"    column="end_date"    />
+        <result property="priorityLevel"    column="priority_level"    />
+    </resultMap>
+
+    <sql id="selectEmisCommissionQuoteVo">
+        select quote_id, quote_code, quote_name, 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">
+        <include refid="selectEmisCommissionQuoteVo"/>
+        <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="calcType != null  and calcType != ''"> and calc_type like concat('%', #{calcType}, '%')</if>
+            <if test="postType != null  and postType != ''"> and post_type like concat('%', #{postType}, '%')</if>
+            <if test="transType != null  and transType != ''"> and trans_type like concat('%', #{transType}, '%')</if>
+            <if test="blOpen != null  and blOpen != ''"> and bl_open like concat('%', #{blOpen}, '%')</if>
+            <if test="empCode != null  and empCode != ''"> and emp_code like concat('%', #{empCode}, '%')</if>
+            <if test="empName != null  and empName != ''"> and emp_name like concat('%', #{empName}, '%')</if>
+            <if test="startDate != null "> and start_date = #{startDate}</if>
+            <if test="endDate != null "> and end_date = #{endDate}</if>
+            <if test="priorityLevel != null "> and priority_level = #{priorityLevel}</if>
+            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
+            <if test="tenantId != null  and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</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>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="checkUnique" parameterType="EmisCommissionQuote"  resultType="int">
+		select count(1) from  emis_commission_quote
+		where del_flag='0'
+           and quote_id = #{quoteId}
+           and quote_code = #{quoteCode}
+           and quote_name = #{quoteName}
+           and calc_type = #{calcType}
+           and post_type = #{postType}
+           and trans_type = #{transType}
+           and bl_open = #{blOpen}
+           and emp_code = #{empCode}
+           and emp_name = #{empName}
+           and start_date = #{startDate}
+           and end_date = #{endDate}
+           and priority_level = #{priorityLevel}
+           and remark = #{remark}
+           and tenant_id = #{tenantId}
+           and del_flag = #{delFlag}
+           and create_by = #{createBy}
+           and create_time = #{createTime}
+           and update_by = #{updateBy}
+           and update_time = #{updateTime}
+           and create_site = #{createSite}
+           and update_site = #{updateSite}
+		limit 1
+	</select>
+  
+    <select id="selectEmisCommissionQuoteByQuoteId" parameterType="Long" resultMap="EmisCommissionQuoteResult">
+        select quote_id, quote_code, quote_name, 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>
+        
+    <insert id="insertEmisCommissionQuote" parameterType="EmisCommissionQuote" useGeneratedKeys="true" keyProperty="quoteId">
+        insert into emis_commission_quote
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="quoteId != null">quote_id,</if>
+            <if test="quoteCode != null and quoteCode != ''">quote_code,</if>
+            <if test="quoteName != null and quoteName != ''">quote_name,</if>
+            <if test="calcType != null and calcType != ''">calc_type,</if>
+            <if test="postType != null and postType != ''">post_type,</if>
+            <if test="transType != null and transType != ''">trans_type,</if>
+            <if test="blOpen != null and blOpen != ''">bl_open,</if>
+            <if test="empCode != null and empCode != ''">emp_code,</if>
+            <if test="empName != null and empName != ''">emp_name,</if>
+            <if test="startDate != null">start_date,</if>
+            <if test="endDate != null">end_date,</if>
+            <if test="priorityLevel != null">priority_level,</if>
+            <if test="remark != null and remark != ''">remark,</if>
+            <if test="tenantId != null and tenantId != ''">tenant_id,</if>
+            <if test="delFlag != null and delFlag != ''">del_flag,</if>
+            <if test="createBy != null and createBy != ''">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null and updateBy != ''">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createSite != null and createSite != ''">create_site,</if>
+            <if test="updateSite != null and updateSite != ''">update_site,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="quoteId != null">#{quoteId},</if>
+            <if test="quoteCode != null and quoteCode != ''">#{quoteCode},</if>
+            <if test="quoteName != null and quoteName != ''">#{quoteName},</if>
+            <if test="calcType != null and calcType != ''">#{calcType},</if>
+            <if test="postType != null and postType != ''">#{postType},</if>
+            <if test="transType != null and transType != ''">#{transType},</if>
+            <if test="blOpen != null and blOpen != ''">#{blOpen},</if>
+            <if test="empCode != null and empCode != ''">#{empCode},</if>
+            <if test="empName != null and empName != ''">#{empName},</if>
+            <if test="startDate != null">#{startDate},</if>
+            <if test="endDate != null">#{endDate},</if>
+            <if test="priorityLevel != null">#{priorityLevel},</if>
+            <if test="remark != null and remark != ''">#{remark},</if>
+            <if test="tenantId != null and tenantId != ''">#{tenantId},</if>
+            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+            <if test="createBy != null and createBy != ''">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createSite != null and createSite != ''">#{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
+         </trim>
+    </insert>
+
+    <update id="updateEmisCommissionQuote" parameterType="EmisCommissionQuote">
+        update emis_commission_quote
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="quoteCode != null and quoteCode != ''">quote_code = #{quoteCode},</if>
+            <if test="quoteName != null and quoteName != ''">quote_name = #{quoteName},</if>
+            <if test="calcType != null and calcType != ''">calc_type = #{calcType},</if>
+            <if test="postType != null and postType != ''">post_type = #{postType},</if>
+            <if test="transType != null and transType != ''">trans_type = #{transType},</if>
+            <if test="blOpen != null and blOpen != ''">bl_open = #{blOpen},</if>
+            <if test="empCode != null and empCode != ''">emp_code = #{empCode},</if>
+            <if test="empName != null and empName != ''">emp_name = #{empName},</if>
+            <if test="startDate != null">start_date = #{startDate},</if>
+            <if test="endDate != null">end_date = #{endDate},</if>
+            <if test="priorityLevel != null">priority_level = #{priorityLevel},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
+        </trim>
+        where quote_id = #{quoteId}
+    </update>
+
+    <delete id="deleteEmisCommissionQuoteByQuoteId" parameterType="Long">
+        delete from emis_commission_quote where quote_id = #{quoteId}
+    </delete>
+
+    <delete id="deleteEmisCommissionQuoteByQuoteIds" parameterType="String">
+        delete from emis_commission_quote where quote_id in 
+        <foreach item="quoteId" collection="array" open="(" separator="," close=")">
+            #{quoteId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file