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 2bcb80a16..882c6552b 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
@@ -1495,16 +1495,24 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             emisWaybillSave.setSendSiteCode("88888");
         }
 
-        if(isNew) {
             if(  "1".equals(emisWaybillSave.getPickupMethod()) && "3".equals(emisWaybillSave.getPickupMethod()) && emisWaybillSave.getIntoWarehouseCode()==null ) {
                 throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"收货仓库必填");
             }
 
-            if(  ("2".equals(emisWaybillSave.getPickupMethod()) || "1".equals(emisWaybillSave.getPickupMethod()) ||  "3".equals(emisWaybillSave.getPickupMethod())  ) && emisWaybillSave.getPickStartDate()==null ){
+            if(  "1".equals(emisWaybillSave.getPickupMethod()) && "3".equals(emisWaybillSave.getPickupMethod()) && emisWaybillSave.getSalesmen()==null ) {
+                throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"收货仓库/整柜提货 销售联系人必填");
+            }
+
+            if( emisWaybillSave.getPickStartDate()==null ){
                 throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"发货/取件日期必填");
             }
+
+        // 回款联系人
+        if(isNew) {
+            emisWaybillSave.setPayee(emisWaybillSave.getSalesmen());
         }
 
+
         // 登记网点,总部
         if(isNew) {
             emisWaybillSave.setRegisterSiteCode("88888");