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 7cee9f0a8..c9b0550ed 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
@@ -208,7 +208,7 @@ public class EmisWaybill extends BaseEntity
     @TableField
     @DataAuditField(fieldComment = "派件方式",dictType="emis_dispatch_method")
     private String dispatchMethod;
-    /* 取件方式:1-上门取件 2-仓库收货 3-整柜提货 */
+    /* 取件方式:1-仓库收货 2-上门取件 3-整柜提货 */
     @TableField
     @DataAuditField(fieldComment = "取件方式",dictType="emis_qujian_fangshi")
     private String pickupMethod;
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/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index fb8f7ebed..2f7445acc 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -2071,6 +2071,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             emisWaybillSave.setPackType("2");
         }
 
+        if ("1".equals(emisWaybillSave.getPickupMethod()) || "3".equals(emisWaybillSave.getPickupMethod())) {
+            emisWaybillSave.setTakePieceEmployeeCode(null);
+        }
         // 如果专属业务员不为空，则寄件网点使用业务员的网点
         if(!StringUtils.isEmpty(emisWaybillSave.getTakePieceEmployeeCode()) && "2".equals(emisWaybillSave.getPickupMethod()) ){
             SysUser empUser = getEmisStaffByCode(emisWaybillSave.getTakePieceEmployeeCode());
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 @@
             <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="empName != null  and empName != ''"> and ( FIND_IN_SET(#{empName},emp_name) or emp_name='全部') </if>
-
-            <if test="transLineCode != null  and transLineCode != ''"> and ( trans_line_code=#{transLineCode} or trans_line_code is null or trans_line_code='') </if>
+            <if test="transLineCode != null  and transLineCode != ''">and (
+                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>
 
         </where>