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 7176da957..5b5a5ef59 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
@@ -474,7 +474,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
emisCommissionQuote.setSendSiteCode(waybill.getSendSiteCode());
emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry());
- emisCommissionQuote.setTransLine(waybill.getTransLineType());
+ emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType());
@@ -607,7 +607,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
emisCommissionQuote.setSendSiteCode(waybill.getSendSiteCode());
emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry());
- emisCommissionQuote.setTransLine(waybill.getTransLineType());
+ emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType());
@@ -747,7 +747,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry());
- emisCommissionQuote.setTransLine(waybill.getTransLineType());
+ emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType());
emisCommissionQuote.setEmpName(empUser.getEmpName());
@@ -895,7 +895,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry());
- emisCommissionQuote.setTransLine(waybill.getTransLineType());
+ emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType());
emisCommissionQuote.setEmpName(empUser.getEmpName());
@@ -1041,7 +1041,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry());
- emisCommissionQuote.setTransLine(waybill.getTransLineType());
+ emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType());
emisCommissionQuote.setEmpName(empUser.getEmpName());
@@ -1157,7 +1157,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry());
- emisCommissionQuote.setTransLine(waybill.getTransLineType());
+ emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType());
emisCommissionQuote.setEmpName(salesmen);
@@ -1293,7 +1293,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry());
- emisCommissionQuote.setTransLine(waybill.getTransLineType());
+ emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType());
diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
index 694f41bc6..d7fa9b110 100644
--- a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
@@ -92,8 +92,10 @@
and bl_open=#{blOpen}
and ( FIND_IN_SET(#{empCode},emp_code) or emp_code='-1')
and ( FIND_IN_SET(#{empName},emp_name) or emp_name='全部')
-
- and ( trans_line_code=#{transLineCode} or trans_line_code is null or trans_line_code='')
+ and (
+ FIND_IN_SET(#{transLineCode},trans_line_code)
+ or trans_line_code is null or trans_line_code='')
+
and ( FIND_IN_SET(#{prodCode},prod_code) or prod_code is null or prod_code='')