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