From 3c3c21f02e01bbdc13412735cc9ab96980a7232a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Thu, 12 Feb 2026 10:10:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E6=A0=B9=E6=8D=AE=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E4=BA=BA=E8=8E=B7=E5=8F=96=E4=BB=93=E5=BA=93id=20=E7=94=A8?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BC=A0=E7=9A=84;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pickingOrder/PickingOrderApplicationService.java        | 6 +++---
 .../service/StockReceiptOrderDomainService.java             | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

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)) {