aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand: 运单提成明细重算员工提成无法根据线路选择合适的提成规则计算bug修复' (#116) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/116
This commit is contained in:
heyu 2025-07-11 15:34:42 +08:00
commit 5f931d236e
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
View File

@ -474,7 +474,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
emisCommissionQuote.setSendSiteCode(waybill.getSendSiteCode()); emisCommissionQuote.setSendSiteCode(waybill.getSendSiteCode());
emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry());
emisCommissionQuote.setTransLine(waybill.getTransLineType()); emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setTransType(transLine.getTransType());
@ -607,7 +607,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
emisCommissionQuote.setSendSiteCode(waybill.getSendSiteCode()); emisCommissionQuote.setSendSiteCode(waybill.getSendSiteCode());
emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry());
emisCommissionQuote.setTransLine(waybill.getTransLineType()); emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setTransType(transLine.getTransType());
@ -747,7 +747,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote(); EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry());
emisCommissionQuote.setTransLine(waybill.getTransLineType()); emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setTransType(transLine.getTransType());
emisCommissionQuote.setEmpName(empUser.getEmpName()); emisCommissionQuote.setEmpName(empUser.getEmpName());
@ -895,7 +895,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote(); EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry());
emisCommissionQuote.setTransLine(waybill.getTransLineType()); emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setTransType(transLine.getTransType());
emisCommissionQuote.setEmpName(empUser.getEmpName()); emisCommissionQuote.setEmpName(empUser.getEmpName());
@ -1041,7 +1041,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote(); EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry());
emisCommissionQuote.setTransLine(waybill.getTransLineType()); emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setTransType(transLine.getTransType());
emisCommissionQuote.setEmpName(empUser.getEmpName()); emisCommissionQuote.setEmpName(empUser.getEmpName());
@ -1157,7 +1157,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote(); EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry());
emisCommissionQuote.setTransLine(waybill.getTransLineType()); emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setTransType(transLine.getTransType());
emisCommissionQuote.setEmpName(salesmen); emisCommissionQuote.setEmpName(salesmen);
@ -1293,7 +1293,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote(); EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry());
emisCommissionQuote.setTransLine(waybill.getTransLineType()); emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setTransType(transLine.getTransType());

6
emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
View File

@ -92,8 +92,10 @@
<if test="blOpen != null and blOpen != ''"> and bl_open=#{blOpen}</if> <if test="blOpen != null and blOpen != ''"> and bl_open=#{blOpen}</if>
<if test="empCode != null and empCode != ''"> and ( FIND_IN_SET(#{empCode},emp_code) or emp_code='-1')</if> <if test="empCode != null and empCode != ''"> and ( FIND_IN_SET(#{empCode},emp_code) or emp_code='-1')</if>
<if test="empName != null and empName != ''"> and ( FIND_IN_SET(#{empName},emp_name) or emp_name='全部') </if> <if test="empName != null and empName != ''"> and ( FIND_IN_SET(#{empName},emp_name) or emp_name='全部') </if>
<if test="transLineCode != null and transLineCode != ''">and (
<if test="transLineCode != null and transLineCode != ''"> and ( trans_line_code=#{transLineCode} or trans_line_code is null or trans_line_code='') </if> FIND_IN_SET(#{transLineCode},trans_line_code)
or trans_line_code is null or trans_line_code='')
</if>
<if test="prodCode != null and prodCode != ''"> and ( FIND_IN_SET(#{prodCode},prod_code) or prod_code is null or prod_code='') </if> <if test="prodCode != null and prodCode != ''"> and ( FIND_IN_SET(#{prodCode},prod_code) or prod_code is null or prod_code='') </if>
</where> </where>