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 3b593abfa..81c03b565 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
@@ -1496,11 +1496,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         }
 
         if(isNew) {
-            if(  "1".equals(emisWaybillSave.getPickupMethod()) && emisWaybillSave.getIntoWarehouseCode()==null ) {
+            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()) ) && emisWaybillSave.getPickStartDate()==null ){
+            if(  ("2".equals(emisWaybillSave.getPickupMethod()) || "1".equals(emisWaybillSave.getPickupMethod()) ||  "3".equals(emisWaybillSave.getPickupMethod())  ) && emisWaybillSave.getPickStartDate()==null ){
                 throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"发货/取件日期必填");
             }
         }
@@ -1528,15 +1528,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             }
         }
 
-        if(!StringUtils.isEmpty(emisWaybillSave.getOperateEmployeeCode())  && "1".equals(emisWaybillSave.getPickupMethod())  ){
+        //
+        if(!StringUtils.isEmpty(emisWaybillSave.getOperateEmployeeCode())  && ( "1".equals(emisWaybillSave.getPickupMethod()) ||  "3".equals(emisWaybillSave.getPickupMethod())  )  ){
             SysUser empUser = getEmisStaffByCode(emisWaybillSave.getOperateEmployeeCode());
             if(empUser!=null) {
                 emisWaybillSave.setSendSiteCode(empUser.getOwnerSiteCode());
             }
         }
 
-        // 如果是仓库收货，寄件网点使用仓库编号
-        if( "1".equals(emisWaybillSave.getPickupMethod()) ){
+        // 如果是仓库收货/整柜提货，寄件网点使用仓库编号
+        if( "1".equals(emisWaybillSave.getPickupMethod()) || "3".equals(emisWaybillSave.getPickupMethod()) ){
             if(StringUtils.isEmpty(emisWaybillSave.getIntoWarehouseCode()) ) {
                 throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "仓库不能为空");
             }else{
@@ -1663,8 +1664,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             emisWaybillSave.setSendDate(new Date());
         }
 
-        // 仓库收货时建立入仓预报单
-        if("1".equals(emisWaybillSave.getPickupMethod())) {
+        // 仓库收货/整柜提货  建立入仓预报单
+        if( "1".equals(emisWaybillSave.getPickupMethod()) || "3".equals(emisWaybillSave.getPickupMethod()) ) {
             // 获取进仓单号
             try {
                 //    TAN-SMD-240603-01