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 9335a4b4d..3c11d0707 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
@@ -1388,6 +1388,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             emisWaybillSave.setCalcFeeType("1");
         }
 
+        // 如果是仓库收货
+        if("1".equals(emisWaybillSave.getPickupMethod()) ){
+            if(StringUtils.isEmpty(emisWaybillSave.getIntoWarehouseCode()) ) {
+                throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "仓库不能为空");
+            }else{
+                emisWaybillSave.setSendSiteCode(emisWaybillSave.getIntoWarehouseCode());
+            }
+        }
+
         // 寄件地址
         if(StringUtils.isAnyEmpty(
                 emisWaybillSave.getSendCountry(),