diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSalesCommissionRatioController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSalesCommissionRatioController.java new file mode 100644 index 000000000..4ae9ae37f --- /dev/null +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSalesCommissionRatioController.java @@ -0,0 +1,95 @@ +package com.xdadan.erp.web.emis; + +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.poi.ExcelUtil; +import com.xdadan.erp.emis.domain.EmisSalesCommissionRatio; +import com.xdadan.erp.emis.service.IEmisSalesCommissionRatioService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +/** + * 销售计提比例配置Controller + * 提供增删改查和导出等接口 + */ +@RestController +@RequestMapping("/emis/salesCommissionRatio") +public class EmisSalesCommissionRatioController extends BaseController { + @Autowired + private IEmisSalesCommissionRatioService emisSalesCommissionRatioService; + + /** + * 查询销售计提比例配置列表 + */ + @PreAuthorize("@ss.hasPermi('emis:salesCommissionRatio:list')") + @GetMapping("/list") + public TableDataInfo list(EmisSalesCommissionRatio query) { + startPage(); + List list = emisSalesCommissionRatioService.selectEmisSalesCommissionRatioList(query); + return getDataTable(list); + } + + /** + * 根据ID获取配置 + */ + @PreAuthorize("@ss.hasPermi('emis:salesCommissionRatio:query')") + @GetMapping("/{id}") + public AjaxResult getInfo(@PathVariable Long id) { + return AjaxResult.success(emisSalesCommissionRatioService.selectEmisSalesCommissionRatioById(id)); + } + + /** + * 新增配置 + */ + @PreAuthorize("@ss.hasPermi('emis:salesCommissionRatio:add')") + @Log(title = "销售计提比例配置", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EmisSalesCommissionRatio entity) { + try { + return toAjax(emisSalesCommissionRatioService.insertEmisSalesCommissionRatio(entity)); + } catch (Exception e) { + return AjaxResult.error(e.getMessage()); + } + } + + /** + * 修改配置 + */ + @PreAuthorize("@ss.hasPermi('emis:salesCommissionRatio:edit')") + @Log(title = "销售计提比例配置", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EmisSalesCommissionRatio entity) { + try { + return toAjax(emisSalesCommissionRatioService.updateEmisSalesCommissionRatio(entity)); + } catch (Exception e) { + return AjaxResult.error(e.getMessage()); + } + } + + /** + * 批量删除配置 + */ + @PreAuthorize("@ss.hasPermi('emis:salesCommissionRatio:remove')") + @Log(title = "销售计提比例配置", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(emisSalesCommissionRatioService.deleteEmisSalesCommissionRatioByIds(ids)); + } + + /** + * 导出配置 + */ + @PreAuthorize("@ss.hasPermi('emis:salesCommissionRatio:export')") + @Log(title = "销售计提比例配置", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(javax.servlet.http.HttpServletResponse response, EmisSalesCommissionRatio query) { + List list = emisSalesCommissionRatioService.selectEmisSalesCommissionRatioList(query); + ExcelUtil util = new ExcelUtil<>(EmisSalesCommissionRatio.class); + util.exportExcel(response, list, "销售计提比例配置数据"); + } +} \ No newline at end of file diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSalesCommissionRatio.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSalesCommissionRatio.java new file mode 100644 index 000000000..4f0807ff9 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSalesCommissionRatio.java @@ -0,0 +1,29 @@ +package com.xdadan.erp.emis.domain; + +import lombok.Data; +import com.xdadan.erp.common.core.domain.BaseEntity; +import java.math.BigDecimal; + +/** + * 销售计提比例配置实体类 + * 对应表：emis_sales_commission_ratio + */ +@Data +public class EmisSalesCommissionRatio extends BaseEntity { + /** 主键ID */ + private Long id; + /** 销售主管 */ + private String salesExecutive; + /** 销售主管占比 */ + private BigDecimal salesExecutiveRatio; + /** 销售联系人 */ + private String salesmen; + /** 销售联系人占比 */ + private BigDecimal salesmenRatio; + /** 销售支持 */ + private String salesSupport; + /** 销售支持占比 */ + private BigDecimal salesSupportRatio; + /** 启用状态 1-启用 0-未启用 **/ + private String status; +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java index c9b0550ed..8742ac8c2 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java @@ -724,4 +724,9 @@ public class EmisWaybill extends BaseEntity @DataAuditField(fieldComment = "箱量") private String boxQuantity; + /* 销售支持 */ + private String salesSupport; + /* 销售主管 */ + private String salesExecutive; + } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSalesCommissionRatioMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSalesCommissionRatioMapper.java new file mode 100644 index 000000000..319705e05 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSalesCommissionRatioMapper.java @@ -0,0 +1,83 @@ +/** + * @Project: emis + * @Title: EmisSalesCommissionRatioMapper.java + * @author + * @date + * @Copyright: ShangHai Doitinfo 2022 All rights reserved. + * @version v1.0 + * @Description:

销售计提比例配置 Mapper 接口

+ * Warning : This file is generate by ai tools,don't edit!!! + */ +package com.xdadan.erp.emis.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xdadan.erp.emis.domain.EmisSalesCommissionRatio; + +/** + * @ClassName EmisSalesCommissionRatioMapper + * @Description + *

+ * 销售计提比例配置 Mapper 接口 + *

+ * @author + * @date + */ +public interface EmisSalesCommissionRatioMapper extends BaseMapper { + /** + * 主键查询 + * + * @param id + * @return + */ + EmisSalesCommissionRatio selectEmisSalesCommissionRatioById(Long id); + + /** + * 查询列表 + * + * @param emisSalesCommissionRatio + * @return 集合 + */ + List selectEmisSalesCommissionRatioList( + EmisSalesCommissionRatio emisSalesCommissionRatio); + + /** + * 新增 + * + * @param emisSalesCommissionRatio + * @return + */ + int insertEmisSalesCommissionRatio(EmisSalesCommissionRatio emisSalesCommissionRatio); + + /** + * 修改 + * + * @param emisSalesCommissionRatio + * @return + */ + int updateEmisSalesCommissionRatio(EmisSalesCommissionRatio emisSalesCommissionRatio); + + /** + * 删除 + * + * @param id 主键 + * @return 结果 + */ + int deleteEmisSalesCommissionRatioById(Long id); + + /** + * 批量删除 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + int deleteEmisSalesCommissionRatioByIds(Long[] ids); + + /** + * 验重：salesExecutive、salesmen、salesSupport、status都相同视为重复 + * + * @param emisSalesCommissionRatio + * @return 重复数量 + */ + int checkUnique(EmisSalesCommissionRatio emisSalesCommissionRatio); +} \ No newline at end of file diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSalesCommissionRatioService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSalesCommissionRatioService.java new file mode 100644 index 000000000..1c01aa392 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSalesCommissionRatioService.java @@ -0,0 +1,46 @@ +package com.xdadan.erp.emis.service; + +import com.xdadan.erp.emis.domain.EmisSalesCommissionRatio; +import com.xdadan.erp.emis.domain.exception.EmisBizError; + +import java.util.List; + +/** + * 销售计提比例配置Service接口 + */ +public interface IEmisSalesCommissionRatioService { + /** + * 主键查询 + */ + EmisSalesCommissionRatio selectEmisSalesCommissionRatioById(Long id); + + /** + * 查询销售计提比例配置列表 + */ + List selectEmisSalesCommissionRatioList(EmisSalesCommissionRatio query); + + /** + * 新增销售计提比例配置 + */ + int insertEmisSalesCommissionRatio(EmisSalesCommissionRatio entity) throws EmisBizError; + + /** + * 修改销售计提比例配置 + */ + int updateEmisSalesCommissionRatio(EmisSalesCommissionRatio entity) throws EmisBizError; + + /** + * 批量删除销售计提比例配置 + */ + int deleteEmisSalesCommissionRatioByIds(Long[] ids); + + /** + * 删除单个销售计提比例配置 + */ + int deleteEmisSalesCommissionRatioById(Long id); + + /** + * 校验比例和是否有效（<=100%） + */ + boolean checkRatioValid(EmisSalesCommissionRatio entity); +} \ No newline at end of file diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java index ed7745dea..9604e7183 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java @@ -69,6 +69,9 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements @Autowired RedissonService redissonService; + @Autowired + private EmisSalesCommissionRatioMapper emisSalesCommissionRatioMapper; + /** * 自动计算提成 */ @@ -1340,31 +1343,66 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements } // 插入提成 - if(BigDecimal.valueOf(profitMoney).compareTo(BigDecimal.ZERO)>0) { - - EmisCommissionDtl emisCommissionDtl = new EmisCommissionDtl(); - emisCommissionDtl.setBillCode(waybill.getBillCode()); - emisCommissionDtl.setFeeType(quoteItem.getFeeType()); - - emisCommissionDtl.setBillType("1"); - - emisCommissionDtl.setBillMonth(billMonth); - emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney)); - - emisCommissionDtl.setEmpName(salesmen); - - emisCommissionDtl.setCalcExpr(calcExprStr); - emisCommissionDtl.setQuoteId(exprItem.getQuoteId()); - emisCommissionDtl.setQuoteName(quoteItem.getQuoteName()); - emisCommissionDtl.setExprId(exprItem.getId()); - - emisCommissionDtl.setFeeRemark(calcExprStr); - - emisCommissionDtlMapper.insertEmisCommissionDtl(emisCommissionDtl); - - // 单独根据人名称和月份汇总统计 -// reCalcEmpProfitSumMoney(salesmen,billMonth); - }else{ + if (BigDecimal.valueOf(profitMoney).compareTo(BigDecimal.ZERO) > 0) { + // 新增：按销售分成配置插入多岗位提成 + String salesSupport = waybill.getSalesSupport(); + String salesExecutive = waybill.getSalesExecutive(); + boolean hasRatioInsert = false; + if (StringUtils.isNotEmpty(salesmen) && StringUtils.isNotEmpty(salesSupport) + && StringUtils.isNotEmpty(salesExecutive)) { + EmisSalesCommissionRatio ratioQuery = new EmisSalesCommissionRatio(); + ratioQuery.setSalesmen(salesmen); + ratioQuery.setSalesSupport(salesSupport); + ratioQuery.setSalesExecutive(salesExecutive); + ratioQuery.setStatus("1"); + List ratioList = emisSalesCommissionRatioMapper + .selectEmisSalesCommissionRatioList(ratioQuery); + if (!CollectionUtils.isEmpty(ratioList)) { + EmisSalesCommissionRatio ratio = ratioList.get(0); + // 销售联系人 + if (StringUtils.isNotEmpty(salesmen) && ratio.getSalesmenRatio() != null + && ratio.getSalesmenRatio().compareTo(BigDecimal.ZERO) > 0) { + insertCommissionDtl( + waybill.getBillCode(), quoteItem.getFeeType(), "1", billMonth, + BigDecimal.valueOf(profitMoney).multiply(ratio.getSalesmenRatio()) + .divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP), + salesmen, calcExprStr, exprItem.getQuoteId(), quoteItem.getQuoteName(), + exprItem.getId(), calcExprStr); + hasRatioInsert = true; + } + // 销售支持 + if (StringUtils.isNotEmpty(salesSupport) && ratio.getSalesSupportRatio() != null + && ratio.getSalesSupportRatio().compareTo(BigDecimal.ZERO) > 0) { + insertCommissionDtl( + waybill.getBillCode(), quoteItem.getFeeType(), "1", billMonth, + BigDecimal.valueOf(profitMoney).multiply(ratio.getSalesSupportRatio()) + .divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP), + salesSupport, calcExprStr, exprItem.getQuoteId(), + quoteItem.getQuoteName(), exprItem.getId(), calcExprStr); + hasRatioInsert = true; + } + // 销售主管 + if (StringUtils.isNotEmpty(salesExecutive) && ratio.getSalesExecutiveRatio() != null + && ratio.getSalesExecutiveRatio().compareTo(BigDecimal.ZERO) > 0) { + insertCommissionDtl( + waybill.getBillCode(), quoteItem.getFeeType(), "1", billMonth, + BigDecimal.valueOf(profitMoney).multiply(ratio.getSalesExecutiveRatio()) + .divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP), + salesExecutive, calcExprStr, exprItem.getQuoteId(), + quoteItem.getQuoteName(), exprItem.getId(), calcExprStr); + hasRatioInsert = true; + } + } + } + // 若未查到分成配置或无有效分成，则按原逻辑插入销售员 + if (!hasRatioInsert) { + insertCommissionDtl( + waybill.getBillCode(), quoteItem.getFeeType(), "1", billMonth, + BigDecimal.valueOf(profitMoney), + salesmen, calcExprStr, exprItem.getQuoteId(), quoteItem.getQuoteName(), + exprItem.getId(), calcExprStr); + } + } else { log.error("计算提成费用为0"); } @@ -1379,6 +1417,26 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements } } + /** + * 提成明细插入工具方法，支持金额自定义 + */ + private void insertCommissionDtl( + String billCode, String feeType, String billType, String billMonth, BigDecimal money, + String empName, String calcExpr, Long quoteId, String quoteName, Long exprId, String feeRemark) { + EmisCommissionDtl emisCommissionDtl = new EmisCommissionDtl(); + emisCommissionDtl.setBillCode(billCode); + emisCommissionDtl.setFeeType(feeType); + emisCommissionDtl.setBillType(billType); + emisCommissionDtl.setBillMonth(billMonth); + emisCommissionDtl.setMoney(money); + emisCommissionDtl.setEmpName(empName); + emisCommissionDtl.setCalcExpr(calcExpr); + emisCommissionDtl.setQuoteId(quoteId); + emisCommissionDtl.setQuoteName(quoteName); + emisCommissionDtl.setExprId(exprId); + emisCommissionDtl.setFeeRemark(feeRemark); + emisCommissionDtlMapper.insertEmisCommissionDtl(emisCommissionDtl); + } /** * 计算中转操作提成 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSalesCommissionRatioServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSalesCommissionRatioServiceImpl.java new file mode 100644 index 000000000..c25674d86 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSalesCommissionRatioServiceImpl.java @@ -0,0 +1,117 @@ +package com.xdadan.erp.emis.service.impl; + +import com.xdadan.erp.emis.domain.EmisSalesCommissionRatio; +import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; +import com.xdadan.erp.emis.domain.exception.EmisBizError; +import com.xdadan.erp.emis.mapper.EmisSalesCommissionRatioMapper; +import com.xdadan.erp.emis.service.IEmisSalesCommissionRatioService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.util.List; + +/** + * 销售计提比例配置Service实现类 + * 负责销售计提比例配置的增删改查等业务逻辑处理 + * + * @author heyu + */ +@Service +public class EmisSalesCommissionRatioServiceImpl implements IEmisSalesCommissionRatioService { + @Autowired + private EmisSalesCommissionRatioMapper emisSalesCommissionRatioMapper; + + /** + * 根据主键ID查询销售计提比例配置 + * + * @param id 主键ID + * @return 配置实体 + */ + @Override + public EmisSalesCommissionRatio selectEmisSalesCommissionRatioById(Long id) { + return emisSalesCommissionRatioMapper.selectById(id); + } + + /** + * 查询销售计提比例配置列表 + * + * @param query 查询条件 + * @return 配置列表 + */ + @Override + public List selectEmisSalesCommissionRatioList(EmisSalesCommissionRatio query) { + return emisSalesCommissionRatioMapper.selectEmisSalesCommissionRatioList(query); + } + + /** + * 新增销售计提比例配置 + * + * @param entity 配置实体 + * @return 影响行数 + * @throws IllegalArgumentException 占比校验不通过时抛出 + */ + @Override + public int insertEmisSalesCommissionRatio(EmisSalesCommissionRatio entity) throws EmisBizError { + if (emisSalesCommissionRatioMapper.checkUnique(entity) > 0) { + throw new EmisBizError(EmisBizErrorType.EXISTS, "已存在相同的销售计提比例配置"); + } + if (!checkRatioValid(entity)) { + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "占比总和必须小于等于100%"); + } + return emisSalesCommissionRatioMapper.insertEmisSalesCommissionRatio(entity); + } + + /** + * 修改销售计提比例配置 + * + * @param entity 配置实体 + * @return 影响行数 + * @throws IllegalArgumentException 占比校验不通过时抛出 + */ + @Override + public int updateEmisSalesCommissionRatio(EmisSalesCommissionRatio entity) throws EmisBizError { + if (emisSalesCommissionRatioMapper.checkUnique(entity) > 0) { + throw new EmisBizError(EmisBizErrorType.EXISTS, "已存在相同的销售计提比例配置"); + } + if (!checkRatioValid(entity)) { + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "占比总和必须小于等于100%"); + } + return emisSalesCommissionRatioMapper.updateEmisSalesCommissionRatio(entity); + } + + /** + * 批量删除销售计提比例配置 + * + * @param ids 主键ID数组 + * @return 影响行数 + */ + @Override + public int deleteEmisSalesCommissionRatioByIds(Long[] ids) { + return emisSalesCommissionRatioMapper.deleteEmisSalesCommissionRatioByIds(ids); + } + + /** + * 删除单个销售计提比例配置 + * + * @param id 主键ID + * @return 影响行数 + */ + @Override + public int deleteEmisSalesCommissionRatioById(Long id) { + return emisSalesCommissionRatioMapper.deleteEmisSalesCommissionRatioById(id); + } + + /** + * 校验销售计提比例总和是否有效（<=100%） + * + * @param entity 配置实体 + * @return true-有效，false-无效 + */ + @Override + public boolean checkRatioValid(EmisSalesCommissionRatio entity) { + java.math.BigDecimal sum = entity.getSalesExecutiveRatio() + .add(entity.getSalesmenRatio()) + .add(entity.getSalesSupportRatio()); + return sum.compareTo(new java.math.BigDecimal("100.00")) <= 0; + } +} \ 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 index 4259208fa..1e14e0269 100644 --- a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml @@ -89,7 +89,7 @@ and quote_name like concat('%', #{quoteName}, '%') 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' ) or from_country='-3') - and ( FIND_IN_SET(#{country},country) or country='-1' or country is null or country='' or ( #{country}!='0086' and country='-2' ) or from_country='-3' ) + and ( FIND_IN_SET(#{country},country) or country='-1' or country is null or country='' or ( #{country}!='0086' and country='-2' ) or country='-3' ) and ( ( FIND_IN_SET(#{sendSiteCode},send_site_code) and send_site_code is not null ) or send_site_code is null ) and ( ( FIND_IN_SET(#{nextSiteCode},next_site_code) and next_site_code is not null ) or next_site_code is null ) diff --git a/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml b/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml new file mode 100644 index 000000000..98a9a2a94 --- /dev/null +++ b/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + select id, sales_executive, sales_executive_ratio, salesmen, salesmen_ratio, sales_support, sales_support_ratio, status, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_sales_commission_ratio + + + + + + + + + + + insert into emis_sales_commission_ratio + + sales_executive, + sales_executive_ratio, + salesmen, + salesmen_ratio, + sales_support, + sales_support_ratio, + status, + remark, + del_flag, + create_by, + create_time, + update_by, + update_time, + create_site, + update_site, + + + #{salesExecutive}, + #{salesExecutiveRatio}, + #{salesmen}, + #{salesmenRatio}, + #{salesSupport}, + #{salesSupportRatio}, + #{status}, + #{remark}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{createSite}, + #{updateSite}, + + + + + + UPDATE emis_sales_commission_ratio + + sales_executive = #{salesExecutive}, + sales_executive_ratio = #{salesExecutiveRatio}, + salesmen = #{salesmen}, + salesmen_ratio = #{salesmenRatio}, + sales_support = #{salesSupport}, + sales_support_ratio = #{salesSupportRatio}, + status = #{status}, + remark = #{remark}, + del_flag = #{delFlag}, + update_by = #{updateBy}, + update_time = NOW(), + update_site = #{updateSite}, + + WHERE id = #{id} + + + + + UPDATE emis_sales_commission_ratio + SET del_flag = '1', update_time = NOW() + WHERE id = #{id} + + + + + UPDATE emis_sales_commission_ratio + SET del_flag = '1', update_time = NOW() + WHERE id IN + + #{id} + + + + + + + \ No newline at end of file diff --git a/emis-biz/src/main/resources/mapper/emis/EmisTmsSiteBatchMissRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissRecordMapper.xml similarity index 100% rename from emis-biz/src/main/resources/mapper/emis/EmisTmsSiteBatchMissRecordMapper.xml rename to emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissRecordMapper.xml diff --git a/emis-biz/src/main/resources/mapper/emis/EmisWaybillBatchStatusMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillBatchStatusMapper.xml similarity index 100% rename from emis-biz/src/main/resources/mapper/emis/EmisWaybillBatchStatusMapper.xml rename to emis-biz/src/main/resources/mapper/EmisWaybillBatchStatusMapper.xml diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index babd0ad05..57c1ddf09 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -233,6 +233,8 @@ + + @@ -435,6 +437,8 @@ a3.phone as customer_phone, a3.nick_name as customer_nick_name, a3.avatar as customer_avatar, + a3.sales_support , + a3.sales_executive , p.emp_name as dispatch_man_name,q.site_name as print_site_name, r.emp_name as print_man_name,