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 81c03b565..2bcb80a16 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
@@ -3633,8 +3633,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         }
 
 
-        if(!"1".equals(emisWaybillOld.getPickupMethod())){
-            throw new EmisBizError(EmisBizErrorType.FAIL,"取件方式非仓库收货");
+        if(!"1".equals(emisWaybillOld.getPickupMethod()) && !"3".equals(emisWaybillOld.getPickupMethod())){
+            throw new EmisBizError(EmisBizErrorType.FAIL,"取件方式非仓库收货/整柜提货");
         }
 
         if(StringUtils.isEmpty(emisWaybillOld.getIntoWarehouseBillCode())){
@@ -3791,8 +3791,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         }
 
 
-        if(!"1".equals(emisWaybillOld.getPickupMethod())){
-            throw new EmisBizError(EmisBizErrorType.FAIL,"取件方式非仓库收货");
+        if(!"1".equals(emisWaybillOld.getPickupMethod()) && !"3".equals(emisWaybillOld.getPickupMethod())){
+            throw new EmisBizError(EmisBizErrorType.FAIL,"取件方式非仓库收货/整柜提货");
         }
 
         if(StringUtils.isEmpty(emisWaybillOld.getIntoWarehouseBillCode())){