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/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());