diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
index c6049a450..a4237991d 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
@@ -66,8 +66,8 @@ public class PickingOrderApplicationService {
             if (topOrganizationId != null && topOrganizationId != 1){
                 pickingOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
             }
-            AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
-            pickingOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
+            //AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
+            //pickingOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
         }
         List<PickingOrderPO> pickingOrderPOList = pickingOrderDomainService.queryList(pickingOrderDO);
         
@@ -583,4 +583,4 @@ public class PickingOrderApplicationService {
         returnPickingOrderDO.setMaterialDetailList(returnPickingMaterialDetailDOList);
         return returnPickingOrderDO;
     }
-}
+}
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java
index 9df36dfb3..3f1e1d161 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java
@@ -332,7 +332,10 @@ public class StockReceiptOrderDomainService {
     public Boolean taskDistribution(StockReceiptOrderDO stockReceiptOrderDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         StockReceiptOrderDO stockReceiptOrderDOQuery = new StockReceiptOrderDO();
-        stockReceiptOrderDOQuery.setReceiptOrderIds(stockReceiptOrderDO.getReceiptOrderIds());
+        List<Long> receiptOrderIds = stockReceiptOrderDO.getReceiptOrderIds();
+        if (receiptOrderIds == null || receiptOrderIds.size() == 0) {
+            throw new ServiceException("未选择收货单,或收货单不存在");
+        }
         stockReceiptOrderDOQuery.setTaskDistribution(2);
         List<StockReceiptOrderPO> stockReceiptOrderPOList = stockReceiptOrderService.queryList(stockReceiptOrderDOQuery);
         if (CollectionUtils.isEmpty(stockReceiptOrderPOList)) {