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 b3b05fa82..f8b2b4733 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
@@ -1430,10 +1430,13 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             emisWaybillSave.setSendSiteCode("88888");
         }
 
-
         if(isNew) {
-            if( emisWaybillSave.getSendDate()==null ){
-                throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"发件日期必填");
+            if(  "1".equals(emisWaybillSave.getPickupMethod() && emisWaybillSave.getIntoWarehouseCode()==null ) {
+                throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"收货仓库必填");
+            }
+
+            if(  ("2".equals(emisWaybillSave.getPickupMethod() || "1".equals(emisWaybillSave.getPickupMethod()) && emisWaybillSave.getPickStartDate()==null ){
+                throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"发货/取件日期必填");
             }
         }