From fc87d5cefbbb16b2a3c08c082363dae6633a651f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Tue, 26 May 2026 17:18:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E8=87=AA=E5=8A=A8=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/factory/RemoteOmsFeignFallbackFactory.java     |  8 ++++----
 .../service/StockInOrderDomainService.java             |  3 ++-
 .../service/StockOutOrderDomainService.java            |  8 +++++++-
 .../waveOrder/service/WaveOrderDomainService.java      | 10 +++++++++-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java
index c53068c61..86cf16e0c 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java
@@ -54,10 +54,10 @@ public class RemoteOmsFeignFallbackFactory implements FallbackFactory<OmsService
                 return null;
             }
 
-            @Override
-            public AjaxResult inventoryAdjustmentRecordInsert(InventoryAdjustmentRecord inventoryAdjustmentRecord) {
-                return null;
-            }
+//            @Override
+//            public AjaxResult inventoryAdjustmentRecordInsert(InventoryAdjustmentRecord inventoryAdjustmentRecord) {
+//                return null;
+//            }
 
             @Override
             public AjaxResult getUnitList(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO) {
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java
index 001b832b4..197d36720 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java
@@ -593,7 +593,8 @@ public class StockInOrderDomainService {
         if (!batchInsertResult) {
             throw new ServiceException("生成收货单失败");
         }
-        // 收货任务不随审核自动下发，需在收货单侧手动「任务下发」（delive_task 等）
+        // 审核通过后自动下发收货任务到 PDA（delive_task + 收货作业单），作业人在 PDA/PC 领取任务时写入
+        stockReceiptOrderDomainService.autoTaskDistributionAfterStockInAudit(inOrderNumberList);
         return batchInsertResult;
     }
 
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
index 5f0b02e04..b459824a2 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
@@ -721,7 +721,13 @@ public class StockOutOrderDomainService {
             pickingOrderDOList.add(pickingOrderDO);
         });
         Boolean inserted = pickingOrderDomainService.batchInsert(pickingOrderDOList);
-        // 拣货任务不随生成拣货单自动下发，需在拣货单侧「整单下发/明细下发」
+        if (Boolean.TRUE.equals(inserted)) {
+            List<String> pickingOrderNumbers = pickingOrderDOList.stream()
+                    .map(PickingOrderDO::getPickingOrderNumber)
+                    .filter(StringUtils::isNotBlank)
+                    .collect(Collectors.toList());
+            pickingOrderDomainService.autoTaskDistributionAfterGenPickingOrders(pickingOrderNumbers);
+        }
         return inserted;
     }
 
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/service/WaveOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/service/WaveOrderDomainService.java
index d68e6eaf3..ab5ebd551 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/service/WaveOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/waveOrder/service/WaveOrderDomainService.java
@@ -244,7 +244,15 @@ public class WaveOrderDomainService {
             pickingOrderDO.setMaterialDetailList(pickingMaterialDetailList);
             pickingOrderDOList.add(pickingOrderDO);
         });
-        return pickingOrderDomainService.batchInsert(pickingOrderDOList);
+        Boolean inserted = pickingOrderDomainService.batchInsert(pickingOrderDOList);
+        if (Boolean.TRUE.equals(inserted)) {
+            List<String> pickingOrderNumbers = pickingOrderDOList.stream()
+                    .map(PickingOrderDO::getPickingOrderNumber)
+                    .filter(com.mhd.common.core.utils.StringUtils::isNotBlank)
+                    .collect(Collectors.toList());
+            pickingOrderDomainService.autoTaskDistributionAfterGenPickingOrders(pickingOrderNumbers);
+        }
+        return inserted;
     }
 
     /**